summaryrefslogtreecommitdiffstats
path: root/crash-driver.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-11-11 11:24:30 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-11-11 11:25:55 -0500
commitf70c487fdb567cdd650d03d0f3eaa82d2480a267 (patch)
tree26fc932ce298ffd79d9579288689e2b1ab9bb730 /crash-driver.patch
parente208283f33477c6ad3719ea0c13a400828a25fbe (diff)
downloadkernel-f70c487fdb567cdd650d03d0f3eaa82d2480a267.tar.gz
kernel-f70c487fdb567cdd650d03d0f3eaa82d2480a267.tar.xz
kernel-f70c487fdb567cdd650d03d0f3eaa82d2480a267.zip
Linux v4.3
Diffstat (limited to 'crash-driver.patch')
-rw-r--r--crash-driver.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/crash-driver.patch b/crash-driver.patch
index 4f4cad0ea..d88138440 100644
--- a/crash-driver.patch
+++ b/crash-driver.patch
@@ -148,7 +148,7 @@ index 000000000000..404bcb93c112
+
+#endif /* _ASM_IA64_CRASH_H */
diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c
-index 5b7791dd3965..aee4b870c763 100644
+index 096731049538..e88887827906 100644
--- a/arch/ia64/kernel/ia64_ksyms.c
+++ b/arch/ia64/kernel/ia64_ksyms.c
@@ -84,6 +84,9 @@ EXPORT_SYMBOL(ia64_save_scratch_fpregs);
@@ -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);
}
@@ -269,7 +269,7 @@ index 000000000000..fd4736ec99f5
+
+#endif /* _X86_CRASH_H */
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index a4af8221751e..193f1a7c2ce5 100644
+index a043107da2af..b272397f306a 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -4,6 +4,9 @@
@@ -283,10 +283,10 @@ index a4af8221751e..193f1a7c2ce5 100644
config DEVMEM
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
-index d06cde26031b..0832636fd9bc 100644
+index d8a7579300d2..31c83630f593 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
-@@ -62,3 +62,5 @@ js-rtc-y = rtc.o
+@@ -60,3 +60,5 @@ js-rtc-y = rtc.o
obj-$(CONFIG_TILE_SROM) += tile-srom.o
obj-$(CONFIG_XILLYBUS) += xillybus/