From ddd375105babef0b57c748e38cece86a988dd4fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Weisbecker?= Date: Wed, 24 Sep 2008 16:31:56 +0100 Subject: [PATCH] --- yaml --- r: 116631 b: refs/heads/master c: ac2b86fdef5b44f194eefaa6b7b6aea9423d1bc2 h: refs/heads/master i: 116629: 8f35e9d2ec5f4122efe41c9c8600aeaca7f68a5b 116627: 5140c1e3e9c24ac898f90fccc9c65d98b45583c4 116623: eca1eb92d894520ba01e6e00ead720c414eb68a8 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/ftrace.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 782d8a13bf16..7e8ab41d3aec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37a52f5ef120b93734bb2461744512b55695f69c +refs/heads/master: ac2b86fdef5b44f194eefaa6b7b6aea9423d1bc2 diff --git a/trunk/arch/x86/kernel/ftrace.c b/trunk/arch/x86/kernel/ftrace.c index 66d900248fc2..222507e8157b 100644 --- a/trunk/arch/x86/kernel/ftrace.c +++ b/trunk/arch/x86/kernel/ftrace.c @@ -71,13 +71,13 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code, * No real locking needed, this code is run through * kstop_machine, or before SMP starts. */ - if (__copy_from_user(replaced, (char __user *)ip, MCOUNT_INSN_SIZE)) + if (__copy_from_user_inatomic(replaced, (char __user *)ip, MCOUNT_INSN_SIZE)) return 1; if (memcmp(replaced, old_code, MCOUNT_INSN_SIZE) != 0) return 2; - WARN_ON_ONCE(__copy_to_user((char __user *)ip, new_code, + WARN_ON_ONCE(__copy_to_user_inatomic((char __user *)ip, new_code, MCOUNT_INSN_SIZE)); sync_core();