From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 15 Mar 2012 16:45:58 +0000 (-0700)
Subject: 3.0-stable patches
X-Git-Tag: v3.0.25~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5bac056a66282c2759b0d83dc37838a43c70921d;p=thirdparty%2Fkernel%2Fstable-queue.git

3.0-stable patches

added patches:
	compat-re-add-missing-asm-compat.h-include-to-fix-compile-breakage-on-s390.patch
---

diff --git a/queue-3.0/compat-re-add-missing-asm-compat.h-include-to-fix-compile-breakage-on-s390.patch b/queue-3.0/compat-re-add-missing-asm-compat.h-include-to-fix-compile-breakage-on-s390.patch
new file mode 100644
index 00000000000..2f952bf4ecc
--- /dev/null
+++ b/queue-3.0/compat-re-add-missing-asm-compat.h-include-to-fix-compile-breakage-on-s390.patch
@@ -0,0 +1,32 @@
+From f88668aaee256a331ea03c852c672d3ef7704208 Mon Sep 17 00:00:00 2001
+From: Heiko Carstens <heiko.carstens@de.ibm.com>
+Date: Mon, 5 Mar 2012 14:06:38 +0100
+Subject: compat: Re-add missing asm/compat.h include to fix compile breakage on s390
+
+From: Heiko Carstens <heiko.carstens@de.ibm.com>
+
+For kernels <= 3.0 the backport of 048cd4e51d24ebf7f3552226d03c769d6ad91658
+"compat: fix compile breakage on s390" will break compilation...
+
+Re-add a single #include <asm/compat.h> in order to fix this.
+
+This patch is _not_ necessary for upstream, only for stable kernels
+which include the "build fix" mentioned above.
+
+Reported-by: Jiri Slaby <jslaby@suse.cz>
+Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
+
+---
+ arch/s390/kernel/setup.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/s390/kernel/setup.c
++++ b/arch/s390/kernel/setup.c
+@@ -56,6 +56,7 @@
+ #include <asm/ptrace.h>
+ #include <asm/sections.h>
+ #include <asm/ebcdic.h>
++#include <asm/compat.h>
+ #include <asm/kvm_virtio.h>
+ 
+ long psw_kernel_bits	= (PSW_BASE_BITS | PSW_MASK_DAT | PSW_ASC_PRIMARY |
diff --git a/queue-3.0/series b/queue-3.0/series
index c61b1e3cd4d..24a4dac2095 100644
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -21,3 +21,4 @@ tcp-fix-tcp_shift_skb_data-to-not-shift-sacked-data-below-snd_una.patch
 ipv6-fix-not-join-all-router-mcast-group-when-forwarding-set.patch
 atl1c-dont-use-highprio-tx-queue.patch
 usb-asix-patch-for-sitecom-ln-031.patch
+compat-re-add-missing-asm-compat.h-include-to-fix-compile-breakage-on-s390.patch