diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-09-07 02:19:51 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-09-07 02:19:51 -0400 |
commit | a1922ed661ab2c1637d0b10cde933bd9cd33d965 (patch) | |
tree | 0f1777542b385ebefd30b3586d830fd8ed6fda5b /arch/x86/power/cpu.c | |
parent | 75e33751ca8bbb72dd6f1a74d2810ddc8cbe4bdf (diff) | |
parent | d28daf923ac5e4a0d7cecebae56f3e339189366b (diff) |
Merge branch 'tracing/core' into tracing/hw-breakpoints
Conflicts:
arch/Kconfig
kernel/trace/trace.h
Merge reason: resolve the conflicts, plus adopt to the new
ring-buffer APIs.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/power/cpu.c')
-rw-r--r-- | arch/x86/power/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c index 394cbb88987c..9e63db8cdee4 100644 --- a/arch/x86/power/cpu.c +++ b/arch/x86/power/cpu.c | |||
@@ -226,7 +226,7 @@ static void __restore_processor_state(struct saved_context *ctxt) | |||
226 | do_fpu_end(); | 226 | do_fpu_end(); |
227 | mtrr_ap_init(); | 227 | mtrr_ap_init(); |
228 | 228 | ||
229 | #ifdef CONFIG_X86_32 | 229 | #ifdef CONFIG_X86_OLD_MCE |
230 | mcheck_init(&boot_cpu_data); | 230 | mcheck_init(&boot_cpu_data); |
231 | #endif | 231 | #endif |
232 | } | 232 | } |