diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-02-25 21:27:14 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-02-25 21:27:14 +0100 |
| commit | 02fa9f0451ac639a687bfc145eefe58703ff220e (patch) | |
| tree | fe984acc78f22f6eb8fb98efaba8b1ac2f3ad8d9 /arch/x86/kernel/alternative.c | |
| parent | OMAP2+: clocksource: fix crash on boot when !CONFIG_OMAP_32K_TIMER (diff) | |
| parent | omap4: prcm: Fix the CPUx clockdomain offsets (diff) | |
| download | linux-02fa9f0451ac639a687bfc145eefe58703ff220e.tar.xz linux-02fa9f0451ac639a687bfc145eefe58703ff220e.zip | |
Merge branch 'patches_for_2.6.38rc' of git://git.pwsan.com/linux-2.6 into devel-fixes
Diffstat (limited to 'arch/x86/kernel/alternative.c')
| -rw-r--r-- | arch/x86/kernel/alternative.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 123608531c8f..7038b95d363f 100644 --- a/arch/x86/kernel/alternative.c +++ b/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) |