[kernel/f18] Fix crash-driver.patch to properly use page_is_ram.
Josh Boyer
jwboyer at fedoraproject.org
Mon Oct 14 17:20:59 UTC 2013
commit 3b13d9541963344902db97d59aa461a97057597d
Author: Kyle McMartin <kmcmarti at redhat.com>
Date: Wed Jul 10 10:33:31 2013 -0400
Fix crash-driver.patch to properly use page_is_ram.
crash-driver.patch | 17 +----------------
kernel.spec | 3 +++
2 files changed, 4 insertions(+), 16 deletions(-)
---
diff --git a/crash-driver.patch b/crash-driver.patch
index 239f0f6..a7b7b72 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 bdd8028..2950b5a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2320,6 +2320,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Oct 14 2013 Kyle McMartin <kyle at redhat.com>
+- Fix crash-driver.patch to properly use page_is_ram.
+
* Mon Oct 14 2013 Justin M. Forbes <jforbes at fedoraproject.org> - 3.11.5-100
- Linux v3.11.5
More information about the scm-commits
mailing list