summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>2012-01-14 08:11:31 +0530
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-13 19:11:35 -0800
commita3301b751b19f0efbafddc4034f8e7ce6bf3007b (patch)
tree1b94ed9c9ecf887c53bb416d5e7b59694aa353f6 /arch
parent96e80a7851b44f3decaac0625665cd64e550b71d (diff)
downloadlinux-3.10-a3301b751b19f0efbafddc4034f8e7ce6bf3007b.tar.gz
linux-3.10-a3301b751b19f0efbafddc4034f8e7ce6bf3007b.tar.bz2
linux-3.10-a3301b751b19f0efbafddc4034f8e7ce6bf3007b.zip
x86/mce: Fix CPU hotplug and suspend regression related to MCE
Commit 8a25a2fd126c ("cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular subsystem") changed how things are dealt with in the MCE subsystem. Some of the things that got broken due to this are CPU hotplug and suspend/hibernate. MCE uses per_cpu allocations of struct device. So, when a CPU goes offline and comes back online, in order to ensure that we start from a clean slate with respect to the MCE subsystem, zero out the entire per_cpu device structure to 0 before using it. Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index f22a9f7f639..29ba3297e48 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -2011,7 +2011,7 @@ static __cpuinit int mce_device_create(unsigned int cpu)
if (!mce_available(&boot_cpu_data))
return -EIO;
- memset(&dev->kobj, 0, sizeof(struct kobject));
+ memset(dev, 0, sizeof(struct device));
dev->id = cpu;
dev->bus = &mce_subsys;