summaryrefslogtreecommitdiffstats
path: root/crash-driver.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-04-15 10:47:18 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-04-15 10:47:18 -0400
commitcc7213fcfe3019d0f935cd14e9b64c0d77bd25f4 (patch)
treedf0a7fd10cc86eaf4e3eca0ceab421e9e21fb2a0 /crash-driver.patch
parentb18e6e75364d806d76d99333646943f6765095fb (diff)
downloadkernel-cc7213fcfe3019d0f935cd14e9b64c0d77bd25f4.tar.gz
kernel-cc7213fcfe3019d0f935cd14e9b64c0d77bd25f4.tar.xz
kernel-cc7213fcfe3019d0f935cd14e9b64c0d77bd25f4.zip
Linux v4.0-3843-gbb0fd7ab0986
Diffstat (limited to 'crash-driver.patch')
-rw-r--r--crash-driver.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/crash-driver.patch b/crash-driver.patch
index 9c35b0169..ca77267f6 100644
--- a/crash-driver.patch
+++ b/crash-driver.patch
@@ -240,10 +240,10 @@ index 000000000000..552be5e2c571
+
+#endif /* _S390_CRASH_H */
diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c
-index 2eb34bdfc613..11ce5c98462c 100644
+index 8a993a53fcd6..8f511795b52e 100644
--- a/arch/s390/mm/maccess.c
+++ b/arch/s390/mm/maccess.c
-@@ -193,6 +193,7 @@ void *xlate_dev_mem_ptr(phys_addr_t addr)
+@@ -197,6 +197,7 @@ void *xlate_dev_mem_ptr(phys_addr_t addr)
put_online_cpus();
return bounce;
}
@@ -251,7 +251,7 @@ index 2eb34bdfc613..11ce5c98462c 100644
/*
* Free converted buffer for /dev/mem access (if necessary)
-@@ -202,3 +203,4 @@ void unxlate_dev_mem_ptr(phys_addr_t addr, void *buf)
+@@ -206,3 +207,4 @@ void unxlate_dev_mem_ptr(phys_addr_t addr, void *buf)
if ((void *) addr != buf)
free_page((unsigned long) buf);
}