diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /arch/i386/power | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/i386/power')
| -rw-r--r-- | arch/i386/power/cpu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/i386/power/cpu.c b/arch/i386/power/cpu.c index 1f1572692e0b..50a0bef8c85f 100644 --- a/arch/i386/power/cpu.c +++ b/arch/i386/power/cpu.c | |||
| @@ -118,6 +118,7 @@ void __restore_processor_state(struct saved_context *ctxt) | |||
| 118 | fix_processor_context(); | 118 | fix_processor_context(); |
| 119 | do_fpu_end(); | 119 | do_fpu_end(); |
| 120 | mtrr_ap_init(); | 120 | mtrr_ap_init(); |
| 121 | mcheck_init(&boot_cpu_data); | ||
| 121 | } | 122 | } |
| 122 | 123 | ||
| 123 | void restore_processor_state(void) | 124 | void restore_processor_state(void) |