summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crash-driver.patch17
-rw-r--r--kernel.spec3
2 files changed, 4 insertions, 16 deletions
diff --git a/crash-driver.patch b/crash-driver.patch
index 239f0f6a0..a7b7b72f9 100644
--- a/crash-driver.patch
+++ b/crash-driver.patch
@@ -131,7 +131,7 @@ new file mode 100644
index 0000000..dfcc006
--- /dev/null
+++ b/arch/x86/include/asm/crash.h
-@@ -0,0 +1,75 @@
+@@ -0,0 +1,73 @@
+#ifndef _ASM_I386_CRASH_H
+#define _ASM_I386_CRASH_H
+
@@ -162,8 +162,6 @@ index 0000000..dfcc006
+#include <linux/highmem.h>
+#include <asm/mmzone.h>
+
-+extern int page_is_ram(unsigned long);
-+
+static inline void *
+map_virtual(u64 offset, struct page **pp)
+{
@@ -207,19 +205,6 @@ index 0000000..dfcc006
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_I386_CRASH_H */
-diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
-index be1ef57..ac659f7 100644
---- a/arch/x86/mm/ioremap.c
-+++ b/arch/x86/mm/ioremap.c
-@@ -24,6 +24,8 @@
-
- #include "physaddr.h"
-
-+EXPORT_SYMBOL_GPL(page_is_ram);
-+
- /*
- * Fix up the linear direct mapping of the kernel to avoid cache attribute
- * conflicts.
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 423fd56..e04a561 100644
--- a/drivers/char/Kconfig
diff --git a/kernel.spec b/kernel.spec
index cecf34957..144f824b3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2281,6 +2281,9 @@ fi
# ||----w |
# || ||
%changelog
+* Wed Jul 10 2013 Kyle McMartin <kyle@redhat.com>
+- Fix crash-driver.patch to properly use page_is_ram.
+
* Tue Jul 09 2013 Justin M. Forbes <jforbes@redhat.com> - 3.11.0-0.rc0.git3.1
- Linux v3.10-6378-ga82a729