Fix crash-driver.patch to properly use page_is_ram.

This commit is contained in:
Kyle McMartin 2013-07-10 10:33:31 -04:00 committed by Josh Boyer
parent c7587b5eda
commit c93b40ccfd
2 changed files with 4 additions and 16 deletions

View File

@ -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

View File

@ -2274,6 +2274,9 @@ fi
# and build.
%changelog
* Fri Sep 13 2013 Kyle McMartin <kyle@redhat.com>
- Fix crash-driver.patch to properly use page_is_ram.
* Fri Sep 13 2013 Josh Boyer <jwboyer@fedoraproject.org>
- CVE-2013-XXXX net: sctp: ipv6 ipsec encryption bug in sctp_v6_xmit (rhbz 1007872 1007903)
- CVE-2013-4343 net: use-after-free TUNSETIFF (rhbz 1007733 1007741)