From: Rafael J. Wysocki Date: Thu, 7 Dec 2006 01:14:12 +0000 (+0100) Subject: [PATCH] x86-64: Fix kobject_init() WARN_ON on resume from disk X-Git-Tag: v2.6.20-rc1~145^2^2~8^2~30 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d4c45718b3c0d3045eab803cd15fabbed1ea5bcd;p=linux-2.6-omap-h63xx.git [PATCH] x86-64: Fix kobject_init() WARN_ON on resume from disk Make mce_remove_device() clean up the kobject in per_cpu(device_mce, cpu) after it has been unregistered. Signed-off-by: Rafael J. Wysocki Signed-off-by: Andi Kleen --- diff --git a/arch/x86_64/kernel/mce.c b/arch/x86_64/kernel/mce.c index bbea88801d8..a7440cb9c14 100644 --- a/arch/x86_64/kernel/mce.c +++ b/arch/x86_64/kernel/mce.c @@ -652,6 +652,7 @@ static void mce_remove_device(unsigned int cpu) sysdev_remove_file(&per_cpu(device_mce,cpu), &attr_tolerant); sysdev_remove_file(&per_cpu(device_mce,cpu), &attr_check_interval); sysdev_unregister(&per_cpu(device_mce,cpu)); + memset(&per_cpu(device_mce, cpu).kobj, 0, sizeof(struct kobject)); } /* Get notified when a cpu comes on/off. Be hotplug friendly. */