lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ras' of git://amd64.org/linux/bp into perf/core

Browse Source
This commit is contained in:
Ingo Molnar
2011-10-06 12:54:36 +02:00
parent 9d01402023 9aaef96f61
commit 7b4f86ac05
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
arch/x86/kernel/cpu/mcheck/mce.c
View File

@@ -1140,6 +1140,15 @@ static void mce_start_timer(unsigned long data)
add_timer_on(t, smp_processor_id()); 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) static void mce_do_trigger(struct work_struct *work)
{ {
call_usermodehelper(mce_helper, mce_helper_argv, NULL, UMH_NO_WAIT); 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) static void mce_cpu_restart(void *data)
{ {
del_timer_sync(&__get_cpu_var(mce_timer));
if (!mce_available(__this_cpu_ptr(&cpu_info))) if (!mce_available(__this_cpu_ptr(&cpu_info)))
return; return;
__mcheck_cpu_init_generic(); __mcheck_cpu_init_generic();
@@ -1760,16 +1768,15 @@ static void mce_cpu_restart(void *data)
/* Reinit MCEs after user configuration changes */ /* Reinit MCEs after user configuration changes */
static void mce_restart(void) static void mce_restart(void)
{ {
mce_timer_delete_all();
on_each_cpu(mce_cpu_restart, NULL, 1); on_each_cpu(mce_cpu_restart, NULL, 1);
} }
/* Toggle features for corrected errors */ /* 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))) if (!mce_available(__this_cpu_ptr(&cpu_info)))
return; return;
if (all)
del_timer_sync(&__get_cpu_var(mce_timer));
cmci_clear(); cmci_clear();
} }
@@ -1852,7 +1859,8 @@ static ssize_t set_ignore_ce(struct sys_device *s,
if (mce_ignore_ce ^ !!new) { if (mce_ignore_ce ^ !!new) {
if (new) { if (new) {
/* disable ce features */ /* 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; mce_ignore_ce = 1;
} else { } else {
/* enable ce features */ /* enable ce features */
@@ -1875,7 +1883,7 @@ static ssize_t set_cmci_disabled(struct sys_device *s,
if (mce_cmci_disabled ^ !!new) { if (mce_cmci_disabled ^ !!new) {
if (new) { if (new) {
/* disable cmci */ /* disable cmci */
on_each_cpu(mce_disable_ce, NULL, 1); on_each_cpu(mce_disable_cmci, NULL, 1);
mce_cmci_disabled = 1; mce_cmci_disabled = 1;
} else { } else {
/* enable cmci */ /* enable cmci */