diff options
| author | Borislav Petkov <bp@suse.de> | 2015-06-10 16:17:13 +0200 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2015-06-24 18:17:37 +0200 |
| commit | 6d1e9bf5b04887a2220fbb44be074e9e8376e332 (patch) | |
| tree | cbf5c74f528ed51f177f91d9f1a78f879d259a2e /drivers/edac | |
| parent | f2f3dca1b7a66cbc91f45b59b8606bb325fa869f (diff) | |
| download | linux-6d1e9bf5b04887a2220fbb44be074e9e8376e332.tar.bz2 | |
EDAC, mce_amd_inj: Move bit preparations before the injection
We do get_online_cpus() and then start noodling with the bits. Do that
*before* we grab the hotplug lock.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'drivers/edac')
| -rw-r--r-- | drivers/edac/mce_amd_inj.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/edac/mce_amd_inj.c b/drivers/edac/mce_amd_inj.c index bfb0f350cb0e..b92986b03f93 100644 --- a/drivers/edac/mce_amd_inj.c +++ b/drivers/edac/mce_amd_inj.c @@ -196,16 +196,16 @@ static void do_inject(void) return; } - get_online_cpus(); - if (!cpu_online(cpu)) - goto err; - /* prep MCE global settings for the injection */ mcg_status = MCG_STATUS_MCIP | MCG_STATUS_EIPV; if (!(i_mce.status & MCI_STATUS_PCC)) mcg_status |= MCG_STATUS_RIPV; + get_online_cpus(); + if (!cpu_online(cpu)) + goto err; + toggle_hw_mce_inject(cpu, true); wrmsr_on_cpu(cpu, MSR_IA32_MCG_STATUS, |