diff options
author | Laura Abbott <labbott@fedoraproject.org> | 2015-09-01 15:03:08 -0700 |
---|---|---|
committer | Laura Abbott <labbott@fedoraproject.org> | 2015-09-01 15:59:56 -0700 |
commit | d07b889185195409a6090ed3e12fff475b4258f4 (patch) | |
tree | c2b98784a9c45c2ba5420c4a256c03d1c1c2e125 /crash-driver.patch | |
parent | 07775e21b6d0c7b9c2251deb8cb5ef3052a38c6e (diff) | |
download | kernel-d07b889185195409a6090ed3e12fff475b4258f4.tar.gz kernel-d07b889185195409a6090ed3e12fff475b4258f4.tar.xz kernel-d07b889185195409a6090ed3e12fff475b4258f4.zip |
Linux v4.2
This is a squashed patch of the history from F22 + the 4.2 rebase
Diffstat (limited to 'crash-driver.patch')
-rw-r--r-- | crash-driver.patch | 122 |
1 files changed, 60 insertions, 62 deletions
diff --git a/crash-driver.patch b/crash-driver.patch index 31e2b329c..4f4cad0ea 100644 --- a/crash-driver.patch +++ b/crash-driver.patch @@ -1,66 +1,67 @@ -From 1786bc697d34af944e29437ce44337b0eb8b6799 Mon Sep 17 00:00:00 2001 -From: Kyle McMartin <kyle@dreadnought.bos.jkkm.org> +From: Dave Anderson <anderson@redhat.com> Date: Tue, 26 Nov 2013 12:42:46 -0500 Subject: [PATCH] crash-driver +Bugzilla: N/A +Upstream-status: Fedora mustard --- - arch/arm/include/asm/crash.h | 6 ++ - arch/arm64/include/asm/crash.h | 6 ++ - arch/ia64/include/asm/crash.h | 90 +++++++++++++++++++++++++++ - arch/ia64/kernel/ia64_ksyms.c | 3 + - arch/powerpc/include/asm/crash.h | 6 ++ - arch/s390/include/asm/crash.h | 60 ++++++++++++++++++ - arch/s390/mm/maccess.c | 2 + - arch/x86/include/asm/crash.h | 6 ++ - drivers/char/Kconfig | 3 + - drivers/char/Makefile | 2 + - drivers/char/crash.c | 128 +++++++++++++++++++++++++++++++++++++++ - include/asm-generic/crash.h | 72 ++++++++++++++++++++++ + arch/arm/include/asm/crash-driver.h | 6 ++ + arch/arm64/include/asm/crash-driver.h | 6 ++ + arch/ia64/include/asm/crash-driver.h | 90 ++++++++++++++++++++++ + arch/ia64/kernel/ia64_ksyms.c | 3 + + arch/powerpc/include/asm/crash-driver.h | 6 ++ + arch/s390/include/asm/crash-driver.h | 60 +++++++++++++++ + arch/s390/mm/maccess.c | 2 + + arch/x86/include/asm/crash-driver.h | 6 ++ + drivers/char/Kconfig | 3 + + drivers/char/Makefile | 2 + + drivers/char/crash.c | 128 ++++++++++++++++++++++++++++++++ + include/asm-generic/crash-driver.h | 72 ++++++++++++++++++ 12 files changed, 384 insertions(+) - create mode 100644 arch/arm/include/asm/crash.h - create mode 100644 arch/arm64/include/asm/crash.h - create mode 100644 arch/ia64/include/asm/crash.h - create mode 100644 arch/powerpc/include/asm/crash.h - create mode 100644 arch/s390/include/asm/crash.h - create mode 100644 arch/x86/include/asm/crash.h + create mode 100644 arch/arm/include/asm/crash-driver.h + create mode 100644 arch/arm64/include/asm/crash-driver.h + create mode 100644 arch/ia64/include/asm/crash-driver.h + create mode 100644 arch/powerpc/include/asm/crash-driver.h + create mode 100644 arch/s390/include/asm/crash-driver.h + create mode 100644 arch/x86/include/asm/crash-driver.h create mode 100644 drivers/char/crash.c - create mode 100644 include/asm-generic/crash.h + create mode 100644 include/asm-generic/crash-driver.h -diff --git a/arch/arm/include/asm/crash.h b/arch/arm/include/asm/crash.h +diff --git a/arch/arm/include/asm/crash-driver.h b/arch/arm/include/asm/crash-driver.h new file mode 100644 -index 0000000..1d2e537 +index 000000000000..06e7ae916601 --- /dev/null -+++ b/arch/arm/include/asm/crash.h ++++ b/arch/arm/include/asm/crash-driver.h @@ -0,0 +1,6 @@ +#ifndef _ARM_CRASH_H +#define _ARM_CRASH_H + -+#include <asm-generic/crash.h> ++#include <asm-generic/crash-driver.h> + +#endif /* _ARM_CRASH_H */ -diff --git a/arch/arm64/include/asm/crash.h b/arch/arm64/include/asm/crash.h +diff --git a/arch/arm64/include/asm/crash-driver.h b/arch/arm64/include/asm/crash-driver.h new file mode 100644 -index 0000000..a7fcc28 +index 000000000000..43b26da0c5d6 --- /dev/null -+++ b/arch/arm64/include/asm/crash.h ++++ b/arch/arm64/include/asm/crash-driver.h @@ -0,0 +1,6 @@ +#ifndef _ARM64_CRASH_H +#define _ARM64_CRASH_H + -+#include <asm-generic/crash.h> ++#include <asm-generic/crash-driver.h> + +#endif /* _ARM64_CRASH_H */ -diff --git a/arch/ia64/include/asm/crash.h b/arch/ia64/include/asm/crash.h +diff --git a/arch/ia64/include/asm/crash-driver.h b/arch/ia64/include/asm/crash-driver.h new file mode 100644 -index 0000000..28bd955 +index 000000000000..404bcb93c112 --- /dev/null -+++ b/arch/ia64/include/asm/crash.h ++++ b/arch/ia64/include/asm/crash-driver.h @@ -0,0 +1,90 @@ +#ifndef _ASM_IA64_CRASH_H +#define _ASM_IA64_CRASH_H + +/* -+ * linux/include/asm-ia64/crash.h ++ * linux/include/asm-ia64/crash-driver.h + * + * Copyright (c) 2004 Red Hat, Inc. All rights reserved. + * @@ -147,7 +148,7 @@ index 0000000..28bd955 + +#endif /* _ASM_IA64_CRASH_H */ diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c -index 5b7791d..aee4b87 100644 +index 5b7791dd3965..aee4b870c763 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); @@ -160,23 +161,23 @@ index 5b7791d..aee4b87 100644 #if defined(CONFIG_IA64_ESI) || defined(CONFIG_IA64_ESI_MODULE) extern void esi_call_phys (void); EXPORT_SYMBOL_GPL(esi_call_phys); -diff --git a/arch/powerpc/include/asm/crash.h b/arch/powerpc/include/asm/crash.h +diff --git a/arch/powerpc/include/asm/crash-driver.h b/arch/powerpc/include/asm/crash-driver.h new file mode 100644 -index 0000000..daa8c4d +index 000000000000..50092d965dc5 --- /dev/null -+++ b/arch/powerpc/include/asm/crash.h ++++ b/arch/powerpc/include/asm/crash-driver.h @@ -0,0 +1,6 @@ +#ifndef _PPC64_CRASH_H +#define _PPC64_CRASH_H + -+#include <asm-generic/crash.h> ++#include <asm-generic/crash-driver.h> + +#endif /* _PPC64_CRASH_H */ -diff --git a/arch/s390/include/asm/crash.h b/arch/s390/include/asm/crash.h +diff --git a/arch/s390/include/asm/crash-driver.h b/arch/s390/include/asm/crash-driver.h new file mode 100644 -index 0000000..552be5e +index 000000000000..552be5e2c571 --- /dev/null -+++ b/arch/s390/include/asm/crash.h ++++ b/arch/s390/include/asm/crash-driver.h @@ -0,0 +1,60 @@ +#ifndef _S390_CRASH_H +#define _S390_CRASH_H @@ -239,10 +240,10 @@ index 0000000..552be5e + +#endif /* _S390_CRASH_H */ diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c -index d1e0e0c..a2be459 100644 +index 2eb34bdfc613..11ce5c98462c 100644 --- a/arch/s390/mm/maccess.c +++ b/arch/s390/mm/maccess.c -@@ -219,6 +219,7 @@ void *xlate_dev_mem_ptr(unsigned long addr) +@@ -193,6 +193,7 @@ void *xlate_dev_mem_ptr(phys_addr_t addr) put_online_cpus(); return bounce; } @@ -250,25 +251,25 @@ index d1e0e0c..a2be459 100644 /* * Free converted buffer for /dev/mem access (if necessary) -@@ -228,3 +229,4 @@ void unxlate_dev_mem_ptr(unsigned long addr, void *buf) +@@ -202,3 +203,4 @@ void unxlate_dev_mem_ptr(phys_addr_t addr, void *buf) if ((void *) addr != buf) free_page((unsigned long) buf); } +EXPORT_SYMBOL_GPL(unxlate_dev_mem_ptr); -diff --git a/arch/x86/include/asm/crash.h b/arch/x86/include/asm/crash.h +diff --git a/arch/x86/include/asm/crash-driver.h b/arch/x86/include/asm/crash-driver.h new file mode 100644 -index 0000000..27a4156 +index 000000000000..fd4736ec99f5 --- /dev/null -+++ b/arch/x86/include/asm/crash.h ++++ b/arch/x86/include/asm/crash-driver.h @@ -0,0 +1,6 @@ +#ifndef _X86_CRASH_H +#define _X86_CRASH_H + -+#include <asm-generic/crash.h> ++#include <asm-generic/crash-driver.h> + +#endif /* _X86_CRASH_H */ diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig -index fa3243d..83643e5b 100644 +index a4af8221751e..193f1a7c2ce5 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -4,6 +4,9 @@ @@ -280,20 +281,20 @@ index fa3243d..83643e5b 100644 + source "drivers/tty/Kconfig" - config DEVKMEM + config DEVMEM diff --git a/drivers/char/Makefile b/drivers/char/Makefile -index 7ff1d0d..3ed67af 100644 +index d06cde26031b..0832636fd9bc 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile -@@ -62,3 +62,5 @@ obj-$(CONFIG_JS_RTC) += js-rtc.o - js-rtc-y = rtc.o +@@ -62,3 +62,5 @@ js-rtc-y = rtc.o obj-$(CONFIG_TILE_SROM) += tile-srom.o + obj-$(CONFIG_XILLYBUS) += xillybus/ + +obj-$(CONFIG_CRASH) += crash.o diff --git a/drivers/char/crash.c b/drivers/char/crash.c new file mode 100644 -index 0000000..a142bb3 +index 000000000000..085378a1d539 --- /dev/null +++ b/drivers/char/crash.c @@ -0,0 +1,128 @@ @@ -329,7 +330,7 @@ index 0000000..a142bb3 +#include <asm/io.h> +#include <asm/uaccess.h> +#include <asm/types.h> -+#include <asm/crash.h> ++#include <asm/crash-driver.h> + +#define CRASH_VERSION "1.0" + @@ -425,17 +426,17 @@ index 0000000..a142bb3 +module_exit(crash_cleanup_module); + +MODULE_LICENSE("GPL"); -diff --git a/include/asm-generic/crash.h b/include/asm-generic/crash.h +diff --git a/include/asm-generic/crash-driver.h b/include/asm-generic/crash-driver.h new file mode 100644 -index 0000000..8a0a69a +index 000000000000..25ab9869d566 --- /dev/null -+++ b/include/asm-generic/crash.h ++++ b/include/asm-generic/crash-driver.h @@ -0,0 +1,72 @@ +#ifndef __CRASH_H__ +#define __CRASH_H__ + +/* -+ * include/linux/crash.h ++ * include/linux/crash-driver.h + * + * Copyright (c) 2013 Red Hat, Inc. All rights reserved. + * @@ -503,6 +504,3 @@ index 0000000..8a0a69a +#endif /* __KERNEL__ */ + +#endif /* __CRASH_H__ */ --- -1.8.3.1 - |