3.9-stable patches

added patches:
	s390-add-pgste-to-ptep_modify_prot_start.patch

diff --git a/queue-3.9/s390-add-pgste-to-ptep_modify_prot_start.patch b/queue-3.9/s390-add-pgste-to-ptep_modify_prot_start.patch
new file mode 100644 (file)
index 0000000..addfa39
--- /dev/null
+++ b/queue-3.9/s390-add-pgste-to-ptep_modify_prot_start.patch
@@ -0,0 +1,42 @@
+From ben@decadent.org.uk  Mon Jun 10 14:39:38 2013
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Sun, 09 Jun 2013 21:09:24 +0100
+Subject: s390: Add pgste to ptep_modify_prot_start()
+To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: stable@vger.kernel.org, linux-s390@vger.kernel.org, Debian kernel maintainers <debian-kernel@lists.debian.org>
+Message-ID: <1370808564.5614.14.camel@deadeye.wl.decadent.org.uk>
+
+From: Ben Hutchings <ben@decadent.org.uk>
+
+Commit 52f36be0f4e2 's390/pgtable: Fix check for pgste/storage key
+handling', which was commit b56433cb782d upstream, added a use of
+pgste to ptep_modify_prot_start(), but this variable does not exist.
+In mainline, pgste was added by commit d3383632d4e8 's390/mm: add pte
+invalidation notifier for kvm' and initialised to the return value of
+pgste_get_lock(ptep).  Initialise it similarly here.
+
+Compile-tested only.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/s390/include/asm/pgtable.h |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/arch/s390/include/asm/pgtable.h
++++ b/arch/s390/include/asm/pgtable.h
+@@ -1063,11 +1063,12 @@ static inline pte_t ptep_modify_prot_sta
+                                          unsigned long address,
+                                          pte_t *ptep)
+ {
++      pgste_t pgste;
+       pte_t pte;
+ 
+       mm->context.flush_mm = 1;
+       if (mm_has_pgste(mm))
+-              pgste_get_lock(ptep);
++              pgste = pgste_get_lock(ptep);
+ 
+       pte = *ptep;
+       if (!mm_exclusive(mm))

diff --git a/queue-3.9/series b/queue-3.9/series
index b34a20b41014955cc0362ba206e60fa15206a971..ee94585868f757b68761cfa3bf721ecdda9a274f 100644 (file)
--- a/queue-3.9/series
+++ b/queue-3.9/series
@@ -76,3 +76,4 @@ usb-io_ti-fix-chars_in_buffer-overhead.patch
 usb-ti_usb_3410_5052-remove-lsr-from-port-data.patch
 usb-ti_usb_3410_5052-query-hardware-buffer-status-in-chars_in_buffer.patch
 usb-ti_usb_3410_5052-fix-chars_in_buffer-overhead.patch
+s390-add-pgste-to-ptep_modify_prot_start.patch