From: Andrew Morton <akpm@linux-foundation.org>

This is just a guess.  NFI what's going on here.  Everything's gone nuts.

Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Greg KH <greg@kroah.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/x86/kernel/cpuid.c |    3 ---
 arch/x86/kernel/msr.c   |    3 ---
 2 files changed, 6 deletions(-)

diff -puN arch/x86/kernel/cpuid.c~git-x86-vs-pm-acquire-device-locks-on-suspend-rev-3 arch/x86/kernel/cpuid.c
--- a/arch/x86/kernel/cpuid.c~git-x86-vs-pm-acquire-device-locks-on-suspend-rev-3
+++ a/arch/x86/kernel/cpuid.c
@@ -163,9 +163,6 @@ static int __cpuinit cpuid_class_cpu_cal
 	case CPU_DEAD:
 		cpuid_device_destroy(cpu);
 		break;
-	case CPU_UP_CANCELED_FROZEN:
-		destroy_suspended_device(cpuid_class, MKDEV(CPUID_MAJOR, cpu));
-		break;
 	}
 	return err ? NOTIFY_BAD : NOTIFY_OK;
 }
diff -puN arch/x86/kernel/msr.c~git-x86-vs-pm-acquire-device-locks-on-suspend-rev-3 arch/x86/kernel/msr.c
--- a/arch/x86/kernel/msr.c~git-x86-vs-pm-acquire-device-locks-on-suspend-rev-3
+++ a/arch/x86/kernel/msr.c
@@ -161,9 +161,6 @@ static int __cpuinit msr_class_cpu_callb
 	case CPU_DEAD:
 		msr_device_destroy(cpu);
 		break;
-	case CPU_UP_CANCELED_FROZEN:
-		destroy_suspended_device(msr_class, MKDEV(MSR_MAJOR, cpu));
-		break;
 	}
 	return err ? NOTIFY_BAD : NOTIFY_OK;
 }
_