diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-26 13:29:40 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-26 13:29:40 -0400 |
| commit | 5a54bd1307471c1cd0521402fe65e2057edcab2f (patch) | |
| tree | 25fb6a543db4ccc11b6d5662ed2e7facfce39ae7 /arch/arm/mm/copypage-v4mc.c | |
| parent | f9f35677d81adb0feedcd6e0e661784805c8facd (diff) | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
Merge commit 'v2.6.29' into core/header-fixes
Diffstat (limited to 'arch/arm/mm/copypage-v4mc.c')
| -rw-r--r-- | arch/arm/mm/copypage-v4mc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/copypage-v4mc.c b/arch/arm/mm/copypage-v4mc.c index 1601698b9800..7370a7142b04 100644 --- a/arch/arm/mm/copypage-v4mc.c +++ b/arch/arm/mm/copypage-v4mc.c | |||
| @@ -44,7 +44,7 @@ static DEFINE_SPINLOCK(minicache_lock); | |||
| 44 | * instruction. If your processor does not supply this, you have to write your | 44 | * instruction. If your processor does not supply this, you have to write your |
| 45 | * own copy_user_highpage that does the right thing. | 45 | * own copy_user_highpage that does the right thing. |
| 46 | */ | 46 | */ |
| 47 | static void __attribute__((naked)) | 47 | static void __naked |
| 48 | mc_copy_user_page(void *from, void *to) | 48 | mc_copy_user_page(void *from, void *to) |
| 49 | { | 49 | { |
| 50 | asm volatile( | 50 | asm volatile( |