diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-18 09:57:02 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-18 09:57:02 +0100 |
commit | 37ba317c9ed19eb126e40bbf563f2711e191a636 (patch) | |
tree | c5865768f341fc0ab41899fe9af9dc5918784cee /arch/arm/mm/copypage-v3.c | |
parent | 708dc5125309cd33c5daaad3026cc4ae6ef39c8b (diff) | |
parent | ee568b25ee9e160b32d1aef73d8b2ee9c05d34db (diff) | |
download | talos-obmc-linux-37ba317c9ed19eb126e40bbf563f2711e191a636.tar.gz talos-obmc-linux-37ba317c9ed19eb126e40bbf563f2711e191a636.zip |
Merge branches 'sched/cleanups' and 'linus' into sched/core
Diffstat (limited to 'arch/arm/mm/copypage-v3.c')
-rw-r--r-- | arch/arm/mm/copypage-v3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/copypage-v3.c b/arch/arm/mm/copypage-v3.c index 70ed96c8af8e..de9c06854ad7 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\ |