diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 06:38:04 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 06:38:04 -0400 |
| commit | 5fbf24659b75356e2142e1f1b88f67b34cbc3e75 (patch) | |
| tree | 0e470e4cc89b72e3d74939f8c39396a6a0bebb3a /arch/sh/mm/pg-sh7705.c | |
| parent | d89961e2dc87b6e30b8e3f60bd2af5cd92cf4643 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'arch/sh/mm/pg-sh7705.c')
| -rw-r--r-- | arch/sh/mm/pg-sh7705.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/mm/pg-sh7705.c b/arch/sh/mm/pg-sh7705.c index 7f885b7f8aff..eaf25147194c 100644 --- a/arch/sh/mm/pg-sh7705.c +++ b/arch/sh/mm/pg-sh7705.c | |||
| @@ -118,7 +118,7 @@ void copy_user_page(void *to, void *from, unsigned long address, struct page *pg | |||
| 118 | * For SH7705, we have our own implementation for ptep_get_and_clear | 118 | * For SH7705, we have our own implementation for ptep_get_and_clear |
| 119 | * Copied from pg-sh4.c | 119 | * Copied from pg-sh4.c |
| 120 | */ | 120 | */ |
| 121 | inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) | 121 | pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) |
| 122 | { | 122 | { |
| 123 | pte_t pte = *ptep; | 123 | pte_t pte = *ptep; |
| 124 | 124 | ||