diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-08-05 10:27:25 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-08-05 10:27:25 +0100 |
| commit | f15bdfe4fb264ac30d9c176f898cbd52cfd1ffa9 (patch) | |
| tree | d93b59190624c0df80854aff5078c588420c3516 /arch/arm/include/asm/uaccess.h | |
| parent | c89c3a6acb847b03250a83cecae4f5c9ced2d960 (diff) | |
| parent | c70fbb01b11cecfa13d9e746f462617d3ac0e38c (diff) | |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/kernel/perf_event_cpu.c
Diffstat (limited to 'arch/arm/include/asm/uaccess.h')
| -rw-r--r-- | arch/arm/include/asm/uaccess.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h index 7057cf8b87d..a4cd7af475e 100644 --- a/arch/arm/include/asm/uaccess.h +++ b/arch/arm/include/asm/uaccess.h @@ -242,7 +242,7 @@ static inline void set_fs(mm_segment_t fs) #define access_ok(type,addr,size) (__range_ok(addr,size) == 0) #define user_addr_max() \ - (segment_eq(get_fs(), USER_DS) ? TASK_SIZE : ~0UL) + (segment_eq(get_fs(), KERNEL_DS) ? ~0UL : get_fs()) /* * The "__xxx" versions of the user access functions do not verify the |