summaryrefslogtreecommitdiff
path: root/arch/arm/mm/copypage-v3.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-26 17:29:40 (GMT)
committerIngo Molnar <mingo@elte.hu>2009-03-26 17:29:40 (GMT)
commit5a54bd1307471c1cd0521402fe65e2057edcab2f (patch)
tree25fb6a543db4ccc11b6d5662ed2e7facfce39ae7 /arch/arm/mm/copypage-v3.c
parentf9f35677d81adb0feedcd6e0e661784805c8facd (diff)
parent8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff)
downloadlinux-fsl-qoriq-5a54bd1307471c1cd0521402fe65e2057edcab2f.tar.xz
Merge commit 'v2.6.29' into core/header-fixes
Diffstat (limited to 'arch/arm/mm/copypage-v3.c')
-rw-r--r--arch/arm/mm/copypage-v3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/copypage-v3.c b/arch/arm/mm/copypage-v3.c
index 70ed96c..de9c068 100644
--- a/arch/arm/mm/copypage-v3.c
+++ b/arch/arm/mm/copypage-v3.c
@@ -15,7 +15,7 @@
*
* FIXME: do we need to handle cache stuff...
*/
-static void __attribute__((naked))
+static void __naked
v3_copy_user_page(void *kto, const void *kfrom)
{
asm("\n\