diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-17 22:16:30 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-17 22:16:30 -0400 |
| commit | c71327ad9f925a4ddbf24db80ce66165104c4ed0 (patch) | |
| tree | a1560ddfb827d580843d2a32ba19fb0fc85490d8 /arch/arm/mm/copypage-v4wb.c | |
| parent | f507cd22035fdadd5dbb476dd05e9e7ee21c3b84 (diff) | |
| parent | a4bd6a93c3f14691c8a29e53eb04dc734b27f0db (diff) | |
Merge commit 'gcl/merge' into merge
Diffstat (limited to 'arch/arm/mm/copypage-v4wb.c')
| -rw-r--r-- | arch/arm/mm/copypage-v4wb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/copypage-v4wb.c b/arch/arm/mm/copypage-v4wb.c index 3ec93dab7656..9ab098414227 100644 --- a/arch/arm/mm/copypage-v4wb.c +++ b/arch/arm/mm/copypage-v4wb.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | * instruction. If your processor does not supply this, you have to write your | 22 | * instruction. If your processor does not supply this, you have to write your |
| 23 | * own copy_user_highpage that does the right thing. | 23 | * own copy_user_highpage that does the right thing. |
| 24 | */ | 24 | */ |
| 25 | static void __attribute__((naked)) | 25 | static void __naked |
| 26 | v4wb_copy_user_page(void *kto, const void *kfrom) | 26 | v4wb_copy_user_page(void *kto, const void *kfrom) |
| 27 | { | 27 | { |
| 28 | asm("\ | 28 | asm("\ |