Add updated crash driver from Dave Anderson and re-enable

2 files changed, 41 insertions, 38 deletions

diff --git a/crash-driver.patch b/crash-driver.patch
index 5765d046..c3972899 100644
--- a/crash-driver.patch
+++ b/crash-driver.patch
@@ -7,63 +7,63 @@ Date: Tue, 26 Nov 2013 12:42:46 -0500
 Subject: [PATCH] crash-driver
 
 ---
- arch/arm/include/asm/crash.h     |   6 ++
- arch/arm64/include/asm/crash.h   |   6 ++
- arch/ia64/include/asm/crash.h    |  90 +++++++++++++++++++++++++++
+ 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.h |   6 ++
- arch/s390/include/asm/crash.h    |  60 ++++++++++++++++++
+ 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.h     |   6 ++
+ 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.h      |  72 ++++++++++++++++++++++
+ 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
 --- /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
 --- /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
 --- /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.
 + *
@@ -163,23 +163,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
 --- /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
 --- /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
@@ -258,16 +258,16 @@ index d1e0e0c..a2be459 100644
  		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
 --- /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
@@ -332,7 +332,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"
 +
@@ -428,17 +428,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
 --- /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.
 + *
diff --git a/kernel.spec b/kernel.spec
index 087058fb..1936a0e8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -565,7 +565,7 @@ Patch600: 0001-lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
 #rhbz 917708
 Patch700: Revert-userns-Allow-unprivileged-users-to-create-use.patch
 
-# atch800: crash-driver.patch
+Patch800: crash-driver.patch
 
 # crypto/
 
@@ -1295,7 +1295,7 @@ ApplyPatch silence-fbcon-logo.patch
 ApplyPatch Revert-userns-Allow-unprivileged-users-to-create-use.patch
 
 # /dev/crash driver.
-# pplyPatch crash-driver.patch
+ApplyPatch crash-driver.patch
 
 # crypto/
 
@@ -2240,10 +2240,13 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Tue Aug 12 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc0.git4.1
+- Add updated crash driver from Dave Anderson and re-enable
+
 * Tue Aug 12 2014 Kyle McMartin <kyle@fedoraproject.org>
 - kernel-arm64.patch: fix up merge conflict and re-enable
 
-* Tue Aug 12 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc0.git4.1
+* Tue Aug 12 2014 Josh Boyer <jwboyer@fedoraproject.org>
 - Linux v3.16-10473-gc8d6637d0497
 
 * Sat Aug 09 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc0.git3.1