From 8354ee0818e421f5a1231a1d34cfb44e1dcbd1d2 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Fri, 11 Feb 2011 22:07:46 +0100 Subject: [PATCH] --- yaml --- r: 233260 b: refs/heads/master c: d91309f69b7bdb64aeb30106fde8d18c5dd354b5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/alternative.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 15b47821feaa..8467db444bdf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 401b8e1317d288f28d6e1afd13271dcb08fd9869 +refs/heads/master: d91309f69b7bdb64aeb30106fde8d18c5dd354b5 diff --git a/trunk/arch/x86/kernel/alternative.c b/trunk/arch/x86/kernel/alternative.c index 123608531c8f..7038b95d363f 100644 --- a/trunk/arch/x86/kernel/alternative.c +++ b/trunk/arch/x86/kernel/alternative.c @@ -671,7 +671,7 @@ void __kprobes text_poke_smp_batch(struct text_poke_param *params, int n) atomic_set(&stop_machine_first, 1); wrote_text = 0; - stop_machine(stop_machine_text_poke, (void *)&tpp, NULL); + __stop_machine(stop_machine_text_poke, (void *)&tpp, NULL); } #if defined(CONFIG_DYNAMIC_FTRACE) || defined(HAVE_JUMP_LABEL)