From 0f820daeafdf811e500e1c14e7fb2042b540512c Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Fri, 17 Apr 2009 19:24:58 +0200
Subject: [PATCH] --- yaml --- r: 144011 b: refs/heads/master c:
 888d256e9c565cb61505bd218eb37c81fe77a325 h: refs/heads/master i:   144009:
 e8b4fb6201a216dde724249e9228896653c6b03d   144007:
 f76e724c19d529a0203397d30d276c2d0b2304c1 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/x86.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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();
 }