diff options
| author | Li Shaohua <shaohua.li@intel.com> | 2005-06-25 17:55:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 19:24:32 -0400 |
| commit | 5a72e04df5470df0ec646029d31e5528167ab1a7 (patch) | |
| tree | 11be00c3ed3d8bad775e6eec44078c9f942537b9 /arch/i386/kernel/cpu/mcheck/p6.c | |
| parent | fb69c3907ead36b9e9f41ea6f0d0e0ae10a38a47 (diff) | |
[PATCH] suspend/resume SMP support
Using CPU hotplug to support suspend/resume SMP. Both S3 and S4 use
disable/enable_nonboot_cpus API. The S4 part is based on Pavel's original S4
SMP patch.
Signed-off-by: Li Shaohua<shaohua.li@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/kernel/cpu/mcheck/p6.c')
| -rw-r--r-- | arch/i386/kernel/cpu/mcheck/p6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/cpu/mcheck/p6.c b/arch/i386/kernel/cpu/mcheck/p6.c index 46640f8c2494..f01b73f947e1 100644 --- a/arch/i386/kernel/cpu/mcheck/p6.c +++ b/arch/i386/kernel/cpu/mcheck/p6.c | |||
| @@ -80,7 +80,7 @@ static fastcall void intel_machine_check(struct pt_regs * regs, long error_code) | |||
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | /* Set up machine check reporting for processors with Intel style MCE */ | 82 | /* Set up machine check reporting for processors with Intel style MCE */ |
| 83 | void __init intel_p6_mcheck_init(struct cpuinfo_x86 *c) | 83 | void __devinit intel_p6_mcheck_init(struct cpuinfo_x86 *c) |
| 84 | { | 84 | { |
| 85 | u32 l, h; | 85 | u32 l, h; |
| 86 | int i; | 86 | int i; |