.34 patches

diff --git a/queue-2.6.34/series b/queue-2.6.34/series
index 256befa215f3fec953c289784dc93fab95a4eec8..68c6f6ce08dbd28dd6e3995da7730e42397bfe25 100644 (file)
--- a/queue-2.6.34/series
+++ b/queue-2.6.34/series
@@ -1,2 +1,3 @@
 mm-fix-page-table-unmap-for-stack-guard-page-properly.patch
 mm-fix-up-some-user-visible-effects-of-the-stack-guard-page.patch
+vmware-fix-build-error-in-vmware.c.patch

diff --git a/queue-2.6.34/vmware-fix-build-error-in-vmware.c.patch b/queue-2.6.34/vmware-fix-build-error-in-vmware.c.patch
new file mode 100644 (file)
index 0000000..a264230
--- /dev/null
+++ b/queue-2.6.34/vmware-fix-build-error-in-vmware.c.patch
@@ -0,0 +1,29 @@
+From foo@baz Wed Aug 18 13:06:12 PDT 2010
+Date: Wed, 18 Aug 2010 13:06:12 -0700
+To: Greg KH <greg@kroah.com>
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Subject: vmware: fix build error in vmware.c
+
+From: Greg Kroah-Hartman <gregkh@suse.de>
+
+This fixes a build error reported in vmware.c due to commit
+9f242dc10e0c3c1eb32d8c83c18650a35fd7f80d
+
+Reported-by: Sven Joachim <svenjoac@gmx.de>
+Cc: Alok Kataria <akataria@vmware.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ arch/x86/kernel/cpu/vmware.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/x86/kernel/cpu/vmware.c
++++ b/arch/x86/kernel/cpu/vmware.c
+@@ -23,6 +23,7 @@
+ 
+ #include <linux/dmi.h>
+ #include <linux/module.h>
++#include <linux/jiffies.h>
+ #include <asm/div64.h>
+ #include <asm/vmware.h>
+ #include <asm/x86_init.h>