dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

ftrace: do not enclose logic in WARN_ON 

In ftrace, logic is defined in the WARN_ON_ONCE, which can become a
nop with some configs. This patch fixes it.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Steven Rostedt 2008-10-14 18:08:48 -04:00 committed by Ingo Molnar
parent 3e10e879a8
commit c513867561
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/kernel/ftrace.c
View File

@ -62,6 +62,7 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code,
unsigned char *new_code)
{
unsigned char replaced[MCOUNT_INSN_SIZE];
int ret;
/*
* Note: Due to modules and __init, code can
@ -77,8 +78,9 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code,
if (memcmp(replaced, old_code, MCOUNT_INSN_SIZE) != 0)
return 2;
WARN_ON_ONCE(__copy_to_user_inatomic((char __user *)ip, new_code,
MCOUNT_INSN_SIZE));
ret = __copy_to_user_inatomic((char __user *)ip, new_code,
MCOUNT_INSN_SIZE);
WARN_ON_ONCE(ret);
sync_core();