[kernel] r14816 - in dists/lenny/linux-2.6/debian/patches: bugfix/all series

[Dann Frazier]

Author: dannf
Date: Sat Dec 26 18:06:26 2009
New Revision: 14816

Log:
avoid abi change

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/kvm-limit-instructions-to-15-bytes-abi.patch
Modified:
   dists/lenny/linux-2.6/debian/patches/series/21

Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/kvm-limit-instructions-to-15-bytes-abi.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/kvm-limit-instructions-to-15-bytes-abi.patch	Sat Dec 26 18:06:26 2009	(r14816)
@@ -0,0 +1,22 @@
+diff -urpN linux-source-2.6.26.orig/include/asm-x86/kvm_x86_emulate.h linux-source-2.6.26/include/asm-x86/kvm_x86_emulate.h
+--- linux-source-2.6.26.orig/include/asm-x86/kvm_x86_emulate.h	2009-12-25 10:51:51.000000000 -0700
++++ linux-source-2.6.26/include/asm-x86/kvm_x86_emulate.h	2009-12-26 00:31:33.000000000 -0700
+@@ -127,7 +127,7 @@ struct decode_cache {
+ 	unsigned long *override_base;
+ 	unsigned int d;
+ 	unsigned long regs[NR_VCPU_REGS];
+-	unsigned long eip, eip_orig;
++	unsigned long eip;
+ 	/* modrm */
+ 	u8 modrm;
+ 	u8 modrm_mod;
+@@ -138,6 +138,9 @@ struct decode_cache {
+ 	void *modrm_ptr;
+ 	unsigned long modrm_val;
+ 	struct fetch_cache fetch;
++#ifndef __GENKSYMS__
++	unsigned long eip_orig;
++#endif
+ };
+ 
+ struct x86_emulate_ctxt {

Modified: dists/lenny/linux-2.6/debian/patches/series/21
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/21	Thu Dec 24 16:14:28 2009	(r14815)
+++ dists/lenny/linux-2.6/debian/patches/series/21	Sat Dec 26 18:06:26 2009	(r14816)
@@ -42,3 +42,4 @@
 + bugfix/all/firewire-ohci-handle-receive-packets-with-a-data-length-of-zero.patch
 + bugfix/all/ext4-avoid-null-pointer-deref-when-decoding-EROFS-wo-a-journal.patch
 + bugfix/s390/dasd-support-DIAG-access-for-ro-devices.patch
++ bugfix/all/kvm-limit-instructions-to-15-bytes-abi.patch