summaryrefslogtreecommitdiff
path: root/arch/arm/mm/copypage-feroceon.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-19 09:53:57 +0300
committerDavid S. Miller <davem@davemloft.net>2009-03-19 09:53:57 +0300
commit0702b30dd821ac8a4103ddbe545518713fdca9be (patch)
tree8ce0c9f5e58c5ccb99870505eecd139986caa05e /arch/arm/mm/copypage-feroceon.c
parent192d7a4667c6d11d1a174ec4cad9a3c5d5f9043c (diff)
parenta1e4ee22863d41a6fbb24310d7951836cb6dafe7 (diff)
downloadlinux-0702b30dd821ac8a4103ddbe545518713fdca9be.tar.xz
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/arm/mm/copypage-feroceon.c')
-rw-r--r--arch/arm/mm/copypage-feroceon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/copypage-feroceon.c b/arch/arm/mm/copypage-feroceon.c
index c3ba6a94da0c..70997d5bee2d 100644
--- a/arch/arm/mm/copypage-feroceon.c
+++ b/arch/arm/mm/copypage-feroceon.c
@@ -13,7 +13,7 @@
#include <linux/init.h>
#include <linux/highmem.h>
-static void __attribute__((naked))
+static void __naked
feroceon_copy_user_page(void *kto, const void *kfrom)
{
asm("\