rpms/kernel/F-11 linux-2.6-kvm-skip-pit-check.patch, 1.2, 1.3 kernel.spec, 1.1688, 1.1689

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24746

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-kvm-skip-pit-check.patch 
Log Message:
linux-2.6-kvm-skip-pit-check.patch

linux-2.6-kvm-skip-pit-check.patch:
 kvm.c |    4 ++++
 1 file changed, 4 insertions(+)

Index: linux-2.6-kvm-skip-pit-check.patch
===================================================================
RCS file: linux-2.6-kvm-skip-pit-check.patch
diff -N linux-2.6-kvm-skip-pit-check.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-kvm-skip-pit-check.patch	10 Aug 2009 19:11:07 -0000	1.3
@@ -0,0 +1,34 @@
+commit 5bffffc113f91918292283e3819dadd4ca964423
+Author: Marcelo Tosatti <mtosatti at redhat.com>
+Date:   Wed Feb 11 22:45:42 2009 -0200
+
+    KVM: x86: paravirt skip pit-through-ioapic boot check
+    
+    Skip the test which checks if the PIT is properly routed when
+    using the IOAPIC, aimed at buggy hardware.
+    
+    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
+    Signed-off-by: Avi Kivity <avi at redhat.com>
+
+diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
+index 478bca9..eecfc92 100644
+--- a/arch/x86/kernel/kvm.c
++++ b/arch/x86/kernel/kvm.c
+@@ -27,6 +27,7 @@
+ #include <linux/mm.h>
+ #include <linux/highmem.h>
+ #include <linux/hardirq.h>
++#include <asm/timer.h>
+ 
+ #define MMU_QUEUE_SIZE 1024
+ 
+@@ -237,6 +238,9 @@ static void paravirt_ops_setup(void)
+ 		pv_mmu_ops.lazy_mode.enter = kvm_enter_lazy_mmu;
+ 		pv_mmu_ops.lazy_mode.leave = kvm_leave_lazy_mmu;
+ 	}
++#ifdef CONFIG_X86_IO_APIC
++	no_timer_check = 1;
++#endif
+ }
+ 
+ void __init kvm_guest_init(void)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1688
retrieving revision 1.1689
diff -u -p -r1.1688 -r1.1689
--- kernel.spec	10 Aug 2009 19:07:34 -0000	1.1688
+++ kernel.spec	10 Aug 2009 19:11:07 -0000	1.1689
@@ -687,6 +687,9 @@ Patch11081: linux-2.6-x86-delay-tsc-barr
 
 # Commit a44a4a006b860476881ec0098c36584036e1cb91 fron net-next-2.6.git
 Patch12000: linux-2.6-xfrm-export-gc_thresh.patch
+
+Patch13000: linux-2.6-kvm-skip-pit-check.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1255,6 +1258,11 @@ ApplyPatch linux-2.6-silence-acpi-blackl
 #ApplyPatch linux-2.6-v4l-dvb-experimental.patch
 #ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
 
+# kvm
+ApplyPatch linux-2.6-kvm-skip-pit-check.patch
+
+# xen
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1844,6 +1852,7 @@ fi
 - Patch sync-up with F-11-2.6.29.y:
  - linux-2.6-x86-delay-tsc-barrier.patch
  - linux-2.6-fs-cifs-fix-port-numbers.patch
+ - linux-2.6-kvm-skip-pit-check.patch
 
 * Wed Aug 05 2009 Kyle McMartin <kyle at redhat.com>
 - Update to released 2.6.30.4.