Commit bdbfbdd5 authored by Ingo Molnar's avatar Ingo Molnar Committed by H. Peter Anvin
Browse files

x86, mce: clean up non-fatal.c 



Make the coding style match that of the rest of the x86 arch code.

[ Impact: cleanup ]

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 91425084

arch/x86/kernel/cpu/mcheck/non-fatal.c

+29 −28
Original line number Original line Diff line number Diff line
@@ -6,15 +6,14 @@ 
 * This file contains routines to check for non-fatal MCEs every 15s

 * This file contains routines to check for non-fatal MCEs every 15s

 *

 *

 */

 */



#include <linux/init.h>

#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/jiffies.h>

#include <linux/workqueue.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/smp.h>

#include <linux/workqueue.h>

#include <linux/jiffies.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/types.h>

#include <linux/init.h>

#include <linux/smp.h>





#include <asm/processor.h>

#include <asm/processor.h>

#include <asm/system.h>

#include <asm/system.h>
@@ -24,7 +23,7 @@ 




static int		firstbank;

static int		firstbank;





#define MCE_RATE	15*HZ	/* timer rate is 15s */

#define MCE_RATE	(15*HZ)	/* timer rate is 15s */





static void mce_checkregs(void *info)

static void mce_checkregs(void *info)

{

{
@@ -34,25 +33,26 @@ static void mce_checkregs(void *info) 
	for (i = firstbank; i < nr_mce_banks; i++) {

	for (i = firstbank; i < nr_mce_banks; i++) {

		rdmsr(MSR_IA32_MC0_STATUS+i*4, low, high);

		rdmsr(MSR_IA32_MC0_STATUS+i*4, low, high);





		if (high & (1<<31)) {

		if (!(high & (1<<31)))

			printk(KERN_INFO "MCE: The hardware reports a non "

			continue;

				"fatal, correctable incident occurred on "



				"CPU %d.\n",

		printk(KERN_INFO "MCE: The hardware reports a non fatal, "

			"correctable incident occurred on CPU %d.\n",

				smp_processor_id());

				smp_processor_id());



		printk(KERN_INFO "Bank %d: %08x%08x\n", i, high, low);

		printk(KERN_INFO "Bank %d: %08x%08x\n", i, high, low);





		/*

		/*

		 * Scrub the error so we don't pick it up in MCE_RATE

		 * Scrub the error so we don't pick it up in MCE_RATE

			 * seconds time.

		 * seconds time:

		 */

		 */

		wrmsr(MSR_IA32_MC0_STATUS+i*4, 0UL, 0UL);

		wrmsr(MSR_IA32_MC0_STATUS+i*4, 0UL, 0UL);





			/* Serialize */

		/* Serialize: */

		wmb();

		wmb();

		add_taint(TAINT_MACHINE_CHECK);

		add_taint(TAINT_MACHINE_CHECK);

	}

	}

}

}

}





static void mce_work_fn(struct work_struct *work);

static void mce_work_fn(struct work_struct *work);

static DECLARE_DELAYED_WORK(mce_work, mce_work_fn);

static DECLARE_DELAYED_WORK(mce_work, mce_work_fn);
@@ -87,6 +87,7 @@ static int __init init_nonfatal_mce_checker(void) 
	 */

	 */

	schedule_delayed_work(&mce_work, round_jiffies_relative(MCE_RATE));

	schedule_delayed_work(&mce_work, round_jiffies_relative(MCE_RATE));

	printk(KERN_INFO "Machine check exception polling timer started.\n");

	printk(KERN_INFO "Machine check exception polling timer started.\n");



	return 0;

	return 0;

}

}

module_init(init_nonfatal_mce_checker);

module_init(init_nonfatal_mce_checker);