summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-06-18 11:47:58 +0200
committerIngo Molnar <mingo@kernel.org>2012-06-18 11:47:58 +0200
commitd1ece0998eeb7b6543044f32b7d9bcbaf6dc294a (patch)
treebcbb3dddee8b5db83f07585370b1bd57f92296ac /arch/x86
parent76958a61e42fb6277a8431eb17e4bdb24176f1b7 (diff)
parent9c5da09d266ca9b32eb16cf940f8161d949c2fe5 (diff)
Merge branch 'perf/urgent' into perf/core
Merge in all fixes before applying more changes. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/lib/usercopy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/usercopy.c b/arch/x86/lib/usercopy.c
index 677b1ed184c..4f74d94c8d9 100644
--- a/arch/x86/lib/usercopy.c
+++ b/arch/x86/lib/usercopy.c
@@ -22,7 +22,7 @@ copy_from_user_nmi(void *to, const void __user *from, unsigned long n)
void *map;
int ret;
- if (__range_not_ok(from, n, TASK_SIZE) == 0)
+ if (__range_not_ok(from, n, TASK_SIZE))
return len;
do {