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

Commit df20e2eb authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

x86, mce, cmci: remove incorrect __cpuinit/__cpuexit annotations 



Impact: Bug fix on UP

The MCE code is reinitialized from resume, so we can't use
__cpuinit/__cpuexit for most of the code.  Remove those annotations
for anything downstream of mce_init().

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 88ccbedd

arch/x86/kernel/cpu/mcheck/mce_intel_64.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -104,7 +104,7 @@ static DEFINE_SPINLOCK(cmci_discover_lock); 




#define CMCI_THRESHOLD 1

#define CMCI_THRESHOLD 1





static __cpuinit int cmci_supported(int *banks)

static int cmci_supported(int *banks)

{

{

	u64 cap;

	u64 cap;
@@ -147,7 +147,7 @@ static void print_update(char *type, int *hdr, int num) 
 * on this CPU. Use the algorithm recommended in the SDM to discover shared

 * on this CPU. Use the algorithm recommended in the SDM to discover shared

 * banks.

 * banks.

 */

 */

static __cpuinit void cmci_discover(int banks, int boot)

static void cmci_discover(int banks, int boot)

{

{

	unsigned long *owned = (void *)&__get_cpu_var(mce_banks_owned);

	unsigned long *owned = (void *)&__get_cpu_var(mce_banks_owned);

	int hdr = 0;

	int hdr = 0;
@@ -192,7 +192,7 @@ static __cpuinit void cmci_discover(int banks, int boot) 
 * Just in case we missed an event during initialization check

 * Just in case we missed an event during initialization check

 * all the CMCI owned banks.

 * all the CMCI owned banks.

 */

 */

__cpuinit void cmci_recheck(void)

void cmci_recheck(void)

{

{

	unsigned long flags;

	unsigned long flags;

	int banks;

	int banks;
@@ -208,7 +208,7 @@ __cpuinit void cmci_recheck(void) 
 * Disable CMCI on this CPU for all banks it owns when it goes down.

 * Disable CMCI on this CPU for all banks it owns when it goes down.

 * This allows other CPUs to claim the banks on rediscovery.

 * This allows other CPUs to claim the banks on rediscovery.

 */

 */

void __cpuexit cmci_clear(void)

void cmci_clear(void)

{

{

	int i;

	int i;

	int banks;

	int banks;
@@ -233,7 +233,7 @@ void __cpuexit cmci_clear(void) 
 * After a CPU went down cycle through all the others and rediscover

 * After a CPU went down cycle through all the others and rediscover

 * Must run in process context.

 * Must run in process context.

 */

 */

void __cpuexit cmci_rediscover(int dying)

void cmci_rediscover(int dying)

{

{

	int banks;

	int banks;

	int cpu;

	int cpu;