diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2006-12-07 02:14:12 +0100 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-12-07 02:14:12 +0100 |
| commit | d4c45718b3c0d3045eab803cd15fabbed1ea5bcd (patch) | |
| tree | bf78d91a677be03050edb8f84f91de2d9fb0f59d /arch/x86_64 | |
| parent | [PATCH] x86-64: remove duplicate ARCH_DISCONTIGMEM_ENABLE option (diff) | |
| download | linux-d4c45718b3c0d3045eab803cd15fabbed1ea5bcd.tar.xz linux-d4c45718b3c0d3045eab803cd15fabbed1ea5bcd.zip | |
[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 <rjw@sisk.pl>
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64')
| -rw-r--r-- | arch/x86_64/kernel/mce.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/mce.c b/arch/x86_64/kernel/mce.c index bbea88801d88..a7440cb9c14f 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. */ |