diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
| commit | baea7b946f00a291b166ccae7fcfed6c01530cc6 (patch) | |
| tree | 4aa275fbdbec9c7b9b4629e8bee2bbecd3c6a6af /arch/x86/power/cpu.c | |
| parent | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (diff) | |
| parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) | |
Merge branch 'origin' into for-linus
Conflicts:
MAINTAINERS
Diffstat (limited to 'arch/x86/power/cpu.c')
| -rw-r--r-- | arch/x86/power/cpu.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c index 417c9f5b4afa..8aa85f17667e 100644 --- a/arch/x86/power/cpu.c +++ b/arch/x86/power/cpu.c | |||
| @@ -243,10 +243,6 @@ static void __restore_processor_state(struct saved_context *ctxt) | |||
| 243 | 243 | ||
| 244 | do_fpu_end(); | 244 | do_fpu_end(); |
| 245 | mtrr_bp_restore(); | 245 | mtrr_bp_restore(); |
| 246 | |||
| 247 | #ifdef CONFIG_X86_OLD_MCE | ||
| 248 | mcheck_init(&boot_cpu_data); | ||
| 249 | #endif | ||
| 250 | } | 246 | } |
| 251 | 247 | ||
| 252 | /* Needed by apm.c */ | 248 | /* Needed by apm.c */ |