diff --git a/[refs] b/[refs]
index 931b04293045..1d130218cb5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f1ea208968f021943d4103ba59e06bb6d8239cb
+refs/heads/master: 888d256e9c565cb61505bd218eb37c81fe77a325
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
index a1ecec5c03e9..7c1ce5ac6131 100644
--- a/trunk/arch/x86/kvm/x86.c
+++ b/trunk/arch/x86/kvm/x86.c
@@ -2775,6 +2775,9 @@ int kvm_arch_init(void *opaque)
 
 void kvm_arch_exit(void)
 {
+	if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC))
+		cpufreq_unregister_notifier(&kvmclock_cpufreq_notifier_block,
+					    CPUFREQ_TRANSITION_NOTIFIER);
 	kvm_x86_ops = NULL;
 	kvm_mmu_module_exit();
 }