summaryrefslogtreecommitdiff
path: root/arch/arm/mm/copypage-xscale.c
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2009-03-15 21:41:23 -0400
committerNicolas Pitre <nico@cam.org>2009-03-15 21:41:23 -0400
commitd6f818f71fa5db79969aaecba302745199376169 (patch)
treefcdedce488db0f80c7a816e0b52df83a01972838 /arch/arm/mm/copypage-xscale.c
parentace14b82633960a2b6bf6a0b2640c63872a65562 (diff)
parent305b07680f6c6a7e59f996c5bd85f009caff5bb1 (diff)
downloadlinux-d6f818f71fa5db79969aaecba302745199376169.tar.gz
Merge commit '305b07680f' into orion/master
Diffstat (limited to 'arch/arm/mm/copypage-xscale.c')
-rw-r--r--arch/arm/mm/copypage-xscale.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/copypage-xscale.c b/arch/arm/mm/copypage-xscale.c
index d18f2397ee2d..76824d3e966a 100644
--- a/arch/arm/mm/copypage-xscale.c
+++ b/arch/arm/mm/copypage-xscale.c
@@ -42,7 +42,7 @@ static DEFINE_SPINLOCK(minicache_lock);
* Dcache aliasing issue. The writes will be forwarded to the write buffer,
* and merged as appropriate.
*/
-static void __attribute__((naked))
+static void __naked
mc_copy_user_page(void *from, void *to)
{
/*