[kernel] r15135 - dists/lenny-security/linux-2.6/debian/patches/bugfix/x86

[Dann Frazier]

Author: dannf
Date: Tue Feb  9 18:58:27 2010
New Revision: 15135

Log:
Fix warning - pit_ioport_read returned void in 2.6.26

Modified:
   dists/lenny-security/linux-2.6/debian/patches/bugfix/x86/kvm-pit-control-word-is-write-only.patch

Modified: dists/lenny-security/linux-2.6/debian/patches/bugfix/x86/kvm-pit-control-word-is-write-only.patch
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/bugfix/x86/kvm-pit-control-word-is-write-only.patch	Tue Feb  9 15:26:36 2010	(r15134)
+++ dists/lenny-security/linux-2.6/debian/patches/bugfix/x86/kvm-pit-control-word-is-write-only.patch	Tue Feb  9 18:58:27 2010	(r15135)
@@ -9,6 +9,8 @@
     Cc: stable at kernel.org
     Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
 
+Backported to Debian's 2.6.26 by dann frazier <dannf at debian.org>
+
 diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
 index caad189..6a74246 100644
 --- a/arch/x86/kvm/i8254.c
@@ -18,7 +20,7 @@
  
  	addr &= KVM_PIT_CHANNEL_MASK;
 +	if (addr == 3)
-+		return 0;
++		return;
 +
  	s = &pit_state->channels[addr];