summaryrefslogtreecommitdiffstats
path: root/arch/x86/lib
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2013-10-30 21:16:22 +0100
committerIngo Molnar <mingo@kernel.org>2013-11-06 12:34:25 +0100
commit0a196848ca365ec582c6d86659be456be6d4ed96 (patch)
treeb850a9d23a0b487d3e0e6c72b0974569796edf56 /arch/x86/lib
parentperf: Update a stale comment (diff)
downloadlinux-0a196848ca365ec582c6d86659be456be6d4ed96.tar.xz
linux-0a196848ca365ec582c6d86659be456be6d4ed96.zip
perf: Fix arch_perf_out_copy_user default
The arch_perf_output_copy_user() default of __copy_from_user_inatomic() returns bytes not copied, while all other argument functions given DEFINE_OUTPUT_COPY() return bytes copied. Since copy_from_user_nmi() is the odd duck out by returning bytes copied where all other *copy_{to,from}* functions return bytes not copied, change it over and ammend DEFINE_OUTPUT_COPY() to expect bytes not copied. Oddly enough DEFINE_OUTPUT_COPY() already returned bytes not copied while expecting its worker functions to return bytes copied. Signed-off-by: Peter Zijlstra <peterz@infradead.org> Acked-by: will.deacon@arm.com Cc: Frederic Weisbecker <fweisbec@gmail.com> Link: http://lkml.kernel.org/r/20131030201622.GR16117@laptop.programming.kicks-ass.net Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/lib')
-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 5465b8613944..ddf9ecb53cc3 100644
--- a/arch/x86/lib/usercopy.c
+++ b/arch/x86/lib/usercopy.c
@@ -31,6 +31,6 @@ copy_from_user_nmi(void *to, const void __user *from, unsigned long n)
ret = __copy_from_user_inatomic(to, from, n);
pagefault_enable();
- return n - ret;
+ return ret;
}
EXPORT_SYMBOL_GPL(copy_from_user_nmi);