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-v3.c | |
| parent | f507cd22035fdadd5dbb476dd05e9e7ee21c3b84 (diff) | |
| parent | a4bd6a93c3f14691c8a29e53eb04dc734b27f0db (diff) | |
Merge commit 'gcl/merge' into merge
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 @@ | |||
| 15 | * | 15 | * |
| 16 | * FIXME: do we need to handle cache stuff... | 16 | * FIXME: do we need to handle cache stuff... |
| 17 | */ | 17 | */ |
| 18 | static void __attribute__((naked)) | 18 | static void __naked |
| 19 | v3_copy_user_page(void *kto, const void *kfrom) | 19 | v3_copy_user_page(void *kto, const void *kfrom) |
| 20 | { | 20 | { |
| 21 | asm("\n\ | 21 | asm("\n\ |