[kernel] r12538 - in dists/sid/linux-2.6/debian: . patches/bugfix/x86 patches/series

[Dann Frazier]

Author: dannf
Date: Tue Dec 30 18:39:13 2008
New Revision: 12538

Log:
Allow booting Mach images in KVM (Closes: #498940)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/x86/kvm-pit-support-mode-3.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/13

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue Dec 30 18:39:13 2008
@@ -13,8 +13,9 @@
   * Fix speaker output on Toshiba P105 notebooks. (closes: #488063)
   * uvc: Fix incomplete frame drop when switching to a variable
     size format (closes: #508661)
+  * Allow booting Mach images in KVM (Closes: #498940)
 
- -- dann frazier <dannf at debian.org>  Tue, 30 Dec 2008 11:22:02 -0700
+ -- dann frazier <dannf at debian.org>  Tue, 30 Dec 2008 11:29:19 -0700
 
 linux-2.6 (2.6.26-12) unstable; urgency=high
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/x86/kvm-pit-support-mode-3.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/kvm-pit-support-mode-3.patch	Tue Dec 30 18:39:13 2008
@@ -0,0 +1,29 @@
+commit f697554515b06e8d7264f316b25e6da943407142
+Author: Aurelien Jarno <aurelien at aurel32.net>
+Date:   Fri May 2 17:02:23 2008 +0200
+
+    KVM: PIT: support mode 3
+    
+    The in-kernel PIT emulation ignores pending timers if operating
+    under mode 3, which for example Hurd uses.
+    
+    This mode should output a square wave, high for (N+1)/2 counts and low
+    for (N-1)/2 counts. As we only care about the resulting interrupts, the
+    period is N, and mode 3 is the same as mode 2 with regard to
+    interrupts.
+    
+    Signed-off-by: Aurelien Jarno <aurelien at aurel32.net>
+    Signed-off-by: Avi Kivity <avi at qumranet.com>
+
+diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
+index 735ec9a..60074dc 100644
+--- a/arch/x86/kvm/i8254.c
++++ b/arch/x86/kvm/i8254.c
+@@ -308,6 +308,7 @@ static void pit_load_count(struct kvm *kvm, int channel, u32 val)
+ 		create_pit_timer(&ps->pit_timer, val, 0);
+ 		break;
+ 	case 2:
++	case 3:
+ 		create_pit_timer(&ps->pit_timer, val, 1);
+ 		break;
+ 	default:

Modified: dists/sid/linux-2.6/debian/patches/series/13
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/13	(original)
+++ dists/sid/linux-2.6/debian/patches/series/13	Tue Dec 30 18:39:13 2008
@@ -4,3 +4,4 @@
 + bugfix/all/watchdog-ib700wdt-buffer_underflow.patch
 + bugfix/x86/alsa-fix-speaker-output-on-toshiba-p105.patch
 + bugfix/all/uvcvideo-fix-incomplete-frame-drop.patch
++ bugfix/x86/kvm-pit-support-mode-3.patch