diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-04-14 12:03:10 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-04-23 12:41:18 -0400 |
commit | 9923777dff4543050fdf938cf6b19f6d4376b7c5 (patch) | |
tree | a51131ecfe7212f81c42f1a21bf0ff29c0719892 /include/linux/pagemap.h | |
parent | 8353e6c632aeaea1470a286b83e68ca233073068 (diff) |
mm: fixup compilation error due to an asm write through a const pointer
This regression has been introduced in
commit f56f821feb7b36223f309e0ec05986bb137ce418
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Sun Mar 25 19:47:41 2012 +0200
mm: extend prefault helpers to fault in more than PAGE_SIZE
I have failed to notice this because x86 asm seems to happily compile
things as-is.
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/linux/pagemap.h')
-rw-r--r-- | include/linux/pagemap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index c93a9a9bcd35..efa26b4da8d2 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h | |||
@@ -461,7 +461,7 @@ static inline int fault_in_pages_readable(const char __user *uaddr, int size) | |||
461 | static inline int fault_in_multipages_writeable(char __user *uaddr, int size) | 461 | static inline int fault_in_multipages_writeable(char __user *uaddr, int size) |
462 | { | 462 | { |
463 | int ret; | 463 | int ret; |
464 | const char __user *end = uaddr + size - 1; | 464 | char __user *end = uaddr + size - 1; |
465 | 465 | ||
466 | if (unlikely(size == 0)) | 466 | if (unlikely(size == 0)) |
467 | return 0; | 467 | return 0; |