From 12b7a743e11e4aba1d2b48f6c5cebedad962d550 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Fri, 27 Mar 2009 17:55:11 -0300
Subject: [PATCH] Revert "Disable kvmclock by default"

This reverts commit 99472fadb42f136c40baca313e54dd29222438e8.

kvmclok is going to be fixed on kvm-userspace, by:

  Author: Marcelo Tosatti <mtosatti@redhat.com>
  Date:   Wed Mar 25 08:34:21 2009 +0000

      kvm: external module: do not hardcode tsc_khz

      external module compat hard codes tsc_khz as 2000000 if KERNEL_VERSION <
      (2,6,23).

      This breaks kvmclock on hosts with different frequency.

      While tsc_khz was only exported on 2.6.23, the majority of relevant
      older v2.6 based distros seem to have it exported.

      Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
      Signed-off-by: Avi Kivity <avi@redhat.com>

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
RH-Upstream-status: not-applicable
Bugzilla: 492649
Acked-by: Marcelo Tosatti <mtosatti@redhat.com>
Acked-by: Dor Laor <dlaor@redhat.com>
Acked-by: john cooper <john.cooper@redhat.com>
---
 arch/x86/kvm/x86.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index fa1ecff..ccc5bb9 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1001,7 +1001,7 @@ int kvm_dev_ioctl_check_extension(long ext)
 		r = iommu_found();
 		break;
 	case KVM_CAP_CLOCKSOURCE:
-		r = force_kvmclock;
+		r = force_kvmclock || boot_cpu_has(X86_FEATURE_CONSTANT_TSC);
 		break;
 	default:
 		r = 0;
-- 
1.6.1