diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
commit | a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5 (patch) | |
tree | ba054d4b1a20dadec088fd4d8983fb5939227e46 /mm/util.c | |
parent | aec995900fbc8cffa9f0f9e797ef07a0beb2b079 (diff) | |
parent | 7db6a7fa09884b34d2a5d4e6e4ed58664a5f0cf8 (diff) |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'mm/util.c')
-rw-r--r-- | mm/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -227,7 +227,7 @@ void arch_pick_mmap_layout(struct mm_struct *mm) | |||
227 | /* | 227 | /* |
228 | * Like get_user_pages_fast() except its IRQ-safe in that it won't fall | 228 | * Like get_user_pages_fast() except its IRQ-safe in that it won't fall |
229 | * back to the regular GUP. | 229 | * back to the regular GUP. |
230 | * If the architecture not support this fucntion, simply return with no | 230 | * If the architecture not support this function, simply return with no |
231 | * page pinned | 231 | * page pinned |
232 | */ | 232 | */ |
233 | int __attribute__((weak)) __get_user_pages_fast(unsigned long start, | 233 | int __attribute__((weak)) __get_user_pages_fast(unsigned long start, |