diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-15 19:58:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-15 19:58:10 -0400 |
| commit | ed21a66c1862499bb21c8e48a450e13fb830f46b (patch) | |
| tree | 80bead4a058f2e799884c1220d83c7e1f29b43fb /arch/x86 | |
| parent | a95f9b6e092ed862278e08266207c7ab231076b4 (diff) | |
| parent | a70270468234749741c5893ae78e5bb524771402 (diff) | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar.
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
watchdog: Quiet down the boot messages
perf/x86: Fix broken LBR fixup code
tracing: Have tracing_off() actually turn tracing off
Diffstat (limited to 'arch/x86')
| -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) | |||
| 22 | void *map; | 22 | void *map; |
| 23 | int ret; | 23 | int ret; |
| 24 | 24 | ||
| 25 | if (__range_not_ok(from, n, TASK_SIZE) == 0) | 25 | if (__range_not_ok(from, n, TASK_SIZE)) |
| 26 | return len; | 26 | return len; |
| 27 | 27 | ||
| 28 | do { | 28 | do { |