Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a72e04d authored by Li Shaohua's avatar Li Shaohua Committed by Linus Torvalds
Browse files

[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: default avatarLi <Shaohua&lt;shaohua.li@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fb69c390

arch/i386/kernel/cpu/mcheck/k7.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static fastcall void k7_machine_check(struct pt_regs * regs, long error_code) 




/* AMD K7 machine check is Intel like */

void __init amd_mcheck_init(struct cpuinfo_x86 *c)

void __devinit amd_mcheck_init(struct cpuinfo_x86 *c)

{

	u32 l, h;

	int i;

arch/i386/kernel/cpu/mcheck/mce.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#include "mce.h"



int mce_disabled __initdata = 0;

int mce_disabled __devinitdata = 0;

int nr_mce_banks;



EXPORT_SYMBOL_GPL(nr_mce_banks);	/* non-fatal.o */

arch/i386/kernel/cpu/mcheck/p4.c

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ fastcall void smp_thermal_interrupt(struct pt_regs *regs) 
}



/* P4/Xeon Thermal regulation detect and init */

static void __init intel_init_thermal(struct cpuinfo_x86 *c)

static void __devinit intel_init_thermal(struct cpuinfo_x86 *c)

{

	u32 l, h;

	unsigned int cpu = smp_processor_id();
@@ -232,7 +232,7 @@ static fastcall void intel_machine_check(struct pt_regs * regs, long error_code) 
}





void __init intel_p4_mcheck_init(struct cpuinfo_x86 *c)

void __devinit intel_p4_mcheck_init(struct cpuinfo_x86 *c)

{

	u32 l, h;

	int i;

arch/i386/kernel/cpu/mcheck/p6.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static fastcall void intel_machine_check(struct pt_regs * regs, long error_code) 
}



/* Set up machine check reporting for processors with Intel style MCE */

void __init intel_p6_mcheck_init(struct cpuinfo_x86 *c)

void __devinit intel_p6_mcheck_init(struct cpuinfo_x86 *c)

{

	u32 l, h;

	int i;

arch/i386/kernel/cpu/mcheck/winchip.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ static fastcall void winchip_machine_check(struct pt_regs * regs, long error_cod 
}



/* Set up machine check reporting on the Winchip C6 series */

void __init winchip_mcheck_init(struct cpuinfo_x86 *c)

void __devinit winchip_mcheck_init(struct cpuinfo_x86 *c)

{

	u32 lo, hi;

	machine_check_vector = winchip_machine_check;