From 019dab1bf5c559a80bf4fa1a1a850bb267affd17 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Thu, 19 Feb 2009 13:32:57 -0500 Subject: [PATCH] --- yaml --- r: 140785 b: refs/heads/master c: 90c7ac49aa819feb9433b5310089fca6399881c0 h: refs/heads/master i: 140783: 50d36bdc2941b64a43f7f777414535bc6ccc4984 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/ftrace.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 784b70bf39d9..d490c6396b82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16239630974516a8879a3695ee9b4dc661f79f96 +refs/heads/master: 90c7ac49aa819feb9433b5310089fca6399881c0 diff --git a/trunk/arch/x86/kernel/ftrace.c b/trunk/arch/x86/kernel/ftrace.c index 77857d4f7d0f..c56d73894322 100644 --- a/trunk/arch/x86/kernel/ftrace.c +++ b/trunk/arch/x86/kernel/ftrace.c @@ -124,6 +124,10 @@ static void ftrace_mod_code(void) */ mod_code_status = probe_kernel_write(mod_code_ip, mod_code_newcode, MCOUNT_INSN_SIZE); + + /* if we fail, then kill any new writers */ + if (mod_code_status) + mod_code_write = 0; } void ftrace_nmi_enter(void)