From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 17 Aug 2013 04:49:45 +0000 (-0700)
Subject: 3.10-stable patches
X-Git-Tag: v3.0.92~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b087b514b74e06c5826da42eb0bba3c90a5b5d62;p=thirdparty%2Fkernel%2Fstable-queue.git

3.10-stable patches

added patches:
	s390-fix-broken-build.patch
---

diff --git a/queue-3.10/s390-fix-broken-build.patch b/queue-3.10/s390-fix-broken-build.patch
new file mode 100644
index 00000000000..436746b2ebe
--- /dev/null
+++ b/queue-3.10/s390-fix-broken-build.patch
@@ -0,0 +1,41 @@
+From 215b28a5308f3d332df2ee09ef11fda45d7e4a92 Mon Sep 17 00:00:00 2001
+From: Guenter Roeck <linux@roeck-us.net>
+Date: Fri, 16 Aug 2013 20:50:55 -0700
+Subject: s390: Fix broken build
+
+From: Guenter Roeck <linux@roeck-us.net>
+
+commit 215b28a5308f3d332df2ee09ef11fda45d7e4a92 upstream.
+
+Fix this build error:
+
+  In file included from fs/exec.c:61:0:
+  arch/s390/include/asm/tlb.h:35:23: error: expected identifier or '(' before 'unsigned'
+  arch/s390/include/asm/tlb.h:36:1: warning: no semicolon at end of struct or union [enabled by default]
+  arch/s390/include/asm/tlb.h: In function 'tlb_gather_mmu':
+  arch/s390/include/asm/tlb.h:57:5: error: 'struct mmu_gather' has no member named 'end'
+
+Broken due to commit 2b047252d0 ("Fix TLB gather virtual address range
+invalidation corner cases").
+
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+[ Oh well. We had build testing for ppc amd um, but no s390  - Linus ]
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/s390/include/asm/tlb.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/s390/include/asm/tlb.h
++++ b/arch/s390/include/asm/tlb.h
+@@ -32,7 +32,7 @@ struct mmu_gather {
+ 	struct mm_struct *mm;
+ 	struct mmu_table_batch *batch;
+ 	unsigned int fullmm;
+-	unsigned long start, unsigned long end;
++	unsigned long start, end;
+ };
+ 
+ struct mmu_table_batch {
diff --git a/queue-3.10/series b/queue-3.10/series
index 7d5f8dd8240..6c2e34dbcff 100644
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -40,3 +40,4 @@ fix-tlb-gather-virtual-address-range-invalidation-corner.patch
 arm-7809-1-perf-fix-event-validation-for-software-group-leaders.patch
 m68k-truncate-base-in-do_div.patch
 m68k-atari-aranym-fix-natfeat-module-support.patch
+s390-fix-broken-build.patch