summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/copypage-v4wt.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-19 07:53:57 +0100
committerDavid S. Miller <davem@davemloft.net>2009-03-19 07:53:57 +0100
commit0702b30dd821ac8a4103ddbe545518713fdca9be (patch)
tree8ce0c9f5e58c5ccb99870505eecd139986caa05e /arch/arm/mm/copypage-v4wt.c
parentsparc64: Fix crash with /proc/iomem (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 (diff)
downloadlinux-0702b30dd821ac8a4103ddbe545518713fdca9be.tar.xz
linux-0702b30dd821ac8a4103ddbe545518713fdca9be.zip
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/arm/mm/copypage-v4wt.c')
-rw-r--r--arch/arm/mm/copypage-v4wt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/copypage-v4wt.c b/arch/arm/mm/copypage-v4wt.c
index 0f1188efae45..300efafd6643 100644
--- a/arch/arm/mm/copypage-v4wt.c
+++ b/arch/arm/mm/copypage-v4wt.c
@@ -20,7 +20,7 @@
* dirty data in the cache. However, we do have to ensure that
* subsequent reads are up to date.
*/
-static void __attribute__((naked))
+static void __naked
v4wt_copy_user_page(void *kto, const void *kfrom)
{
asm("\