diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-06-18 11:47:58 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-18 11:47:58 +0200 |
| commit | d1ece0998eeb7b6543044f32b7d9bcbaf6dc294a (patch) | |
| tree | bcbb3dddee8b5db83f07585370b1bd57f92296ac /arch | |
| parent | 76958a61e42fb6277a8431eb17e4bdb24176f1b7 (diff) | |
| parent | 9c5da09d266ca9b32eb16cf940f8161d949c2fe5 (diff) | |
| download | linux-d1ece0998eeb7b6543044f32b7d9bcbaf6dc294a.tar.gz linux-d1ece0998eeb7b6543044f32b7d9bcbaf6dc294a.tar.bz2 linux-d1ece0998eeb7b6543044f32b7d9bcbaf6dc294a.zip | |
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')
| -rw-r--r-- | arch/x86/lib/usercopy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/usercopy.c b/arch/x86/lib/usercopy.c index 677b1ed184c9..4f74d94c8d97 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 { |