summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2019-09-11 17:50:30 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2019-09-11 17:50:30 -0400
commit958bff73aa5880edc9ed0b5a94719120f152ec03 (patch)
tree2ba07bfdf1bd98b6b233e321bcda45cdb5d4358d
parent0530c71115f206ef38d440067121ace5a4f03ad7 (diff)
downloadlongterm-queue-4.18-958bff73aa5880edc9ed0b5a94719120f152ec03.tar.gz
s390: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/s390-mm-fix-address-space-detection-in-exception-han.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/queue/s390-mm-fix-address-space-detection-in-exception-han.patch b/queue/s390-mm-fix-address-space-detection-in-exception-han.patch
index 68ea6a5..37e35ed 100644
--- a/queue/s390-mm-fix-address-space-detection-in-exception-han.patch
+++ b/queue/s390-mm-fix-address-space-detection-in-exception-han.patch
@@ -1,4 +1,4 @@
-From 962f0af83c239c0aef05639631e871c874b00f99 Mon Sep 17 00:00:00 2001
+From e560a389040cb8e85275b706c354dee0b504406b Mon Sep 17 00:00:00 2001
From: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Date: Mon, 27 May 2019 18:40:19 +0200
Subject: [PATCH] s390/mm: fix address space detection in exception handling
@@ -22,18 +22,18 @@ Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
-index 91ce03fd0c84..df75d574246d 100644
+index 4cc3f06b0ab3..5189b76133d4 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
-@@ -83,7 +83,6 @@ static inline int notify_page_fault(struct pt_regs *regs)
+@@ -107,7 +107,6 @@ void bust_spinlocks(int yes)
/*
* Find out which address space caused the exception.
- * Access register mode is impossible, ignore space == 3.
*/
- static enum fault_type get_fault_type(struct pt_regs *regs)
+ static inline enum fault_type get_fault_type(struct pt_regs *regs)
{
-@@ -108,6 +107,10 @@ static enum fault_type get_fault_type(struct pt_regs *regs)
+@@ -132,6 +131,10 @@ static inline enum fault_type get_fault_type(struct pt_regs *regs)
}
return VDSO_FAULT;
}
@@ -45,5 +45,5 @@ index 91ce03fd0c84..df75d574246d 100644
return KERNEL_FAULT;
}
--
-2.9.5
+2.7.4