3.0-stable patches

added patches:
	x86-32-mm-remove-reference-to-resume_map_numa_kva.patch

diff --git a/queue-3.0/series b/queue-3.0/series
new file mode 100644 (file)
index 0000000..3e17b2b
--- /dev/null
+++ b/queue-3.0/series
@@ -0,0 +1 @@
+x86-32-mm-remove-reference-to-resume_map_numa_kva.patch

diff --git a/queue-3.0/x86-32-mm-remove-reference-to-resume_map_numa_kva.patch b/queue-3.0/x86-32-mm-remove-reference-to-resume_map_numa_kva.patch
new file mode 100644 (file)
index 0000000..9a1fbbc
--- /dev/null
+++ b/queue-3.0/x86-32-mm-remove-reference-to-resume_map_numa_kva.patch
@@ -0,0 +1,47 @@
+From bb112aec5ee41427e9b9726e3d57b896709598ed Mon Sep 17 00:00:00 2001
+From: "H. Peter Anvin" <hpa@linux.intel.com>
+Date: Thu, 31 Jan 2013 13:53:10 -0800
+Subject: x86-32, mm: Remove reference to resume_map_numa_kva()
+
+From: "H. Peter Anvin" <hpa@linux.intel.com>
+
+commit bb112aec5ee41427e9b9726e3d57b896709598ed upstream.
+
+Remove reference to removed function resume_map_numa_kva().
+
+Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
+Cc: Dave Hansen <dave@linux.vnet.ibm.com>
+Link: http://lkml.kernel.org/r/20130131005616.1C79F411@kernel.stglabs.ibm.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/include/asm/mmzone_32.h |    6 ------
+ arch/x86/power/hibernate_32.c    |    2 --
+ 2 files changed, 8 deletions(-)
+
+--- a/arch/x86/include/asm/mmzone_32.h
++++ b/arch/x86/include/asm/mmzone_32.h
+@@ -14,12 +14,6 @@ extern struct pglist_data *node_data[];
+ 
+ #include <asm/numaq.h>
+ 
+-extern void resume_map_numa_kva(pgd_t *pgd);
+-
+-#else /* !CONFIG_NUMA */
+-
+-static inline void resume_map_numa_kva(pgd_t *pgd) {}
+-
+ #endif /* CONFIG_NUMA */
+ 
+ #ifdef CONFIG_DISCONTIGMEM
+--- a/arch/x86/power/hibernate_32.c
++++ b/arch/x86/power/hibernate_32.c
+@@ -130,8 +130,6 @@ static int resume_physical_mapping_init(
+               }
+       }
+ 
+-      resume_map_numa_kva(pgd_base);
+-
+       return 0;
+ }
+