Merge branch 'ras' of git://amd64.org/linux/bp into perf/core (7b4f86ac) · Commits · e / devices / android_kernel_teracube_2e

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

+14 −6

Original line number	Diff line number	Diff line
		@@ -1140,6 +1140,15 @@ static void mce_start_timer(unsigned long data)
		add_timer_on(t, smp_processor_id());
		}

		/* Must not be called in IRQ context where del_timer_sync() can deadlock */
		static void mce_timer_delete_all(void)
		{
		int cpu;

		for_each_online_cpu(cpu)
		del_timer_sync(&per_cpu(mce_timer, cpu));
		}

		static void mce_do_trigger(struct work_struct *work)
		{
		call_usermodehelper(mce_helper, mce_helper_argv, NULL, UMH_NO_WAIT);
		@@ -1750,7 +1759,6 @@ static struct syscore_ops mce_syscore_ops = {

		static void mce_cpu_restart(void *data)
		{
		del_timer_sync(&__get_cpu_var(mce_timer));
		if (!mce_available(__this_cpu_ptr(&cpu_info)))
		return;
		__mcheck_cpu_init_generic();
		@@ -1760,16 +1768,15 @@ static void mce_cpu_restart(void *data)
		/* Reinit MCEs after user configuration changes */
		static void mce_restart(void)
		{
		mce_timer_delete_all();
		on_each_cpu(mce_cpu_restart, NULL, 1);
		}

		/* Toggle features for corrected errors */
		static void mce_disable_ce(void *all)
		static void mce_disable_cmci(void *data)
		{
		if (!mce_available(__this_cpu_ptr(&cpu_info)))
		return;
		if (all)
		del_timer_sync(&__get_cpu_var(mce_timer));
		cmci_clear();
		}

		@@ -1852,7 +1859,8 @@ static ssize_t set_ignore_ce(struct sys_device *s,
		if (mce_ignore_ce ^ !!new) {
		if (new) {
		/* disable ce features */
		on_each_cpu(mce_disable_ce, (void *)1, 1);
		mce_timer_delete_all();
		on_each_cpu(mce_disable_cmci, NULL, 1);
		mce_ignore_ce = 1;
		} else {
		/* enable ce features */
		@@ -1875,7 +1883,7 @@ static ssize_t set_cmci_disabled(struct sys_device *s,
		if (mce_cmci_disabled ^ !!new) {
		if (new) {
		/* disable cmci */
		on_each_cpu(mce_disable_ce, NULL, 1);
		on_each_cpu(mce_disable_cmci, NULL, 1);
		mce_cmci_disabled = 1;
		} else {
		/* enable cmci */