aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2013-01-31 13:53:10 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-28 06:32:23 -0800
commitdbb694e810c87e7e1760527a783437f26ac5a547 (patch)
tree1d856058bbd99114b5a59757b842b5869d0c2687 /arch/x86
parent21d69845e411bfcee426070af5416ddfba350529 (diff)
downloadkernel_samsung_smdk4412-dbb694e810c87e7e1760527a783437f26ac5a547.tar.gz
kernel_samsung_smdk4412-dbb694e810c87e7e1760527a783437f26ac5a547.tar.bz2
kernel_samsung_smdk4412-dbb694e810c87e7e1760527a783437f26ac5a547.zip
x86-32, mm: Remove reference to resume_map_numa_kva()
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>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/include/asm/mmzone_32.h6
-rw-r--r--arch/x86/power/hibernate_32.c2
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/include/asm/mmzone_32.h b/arch/x86/include/asm/mmzone_32.h
index ffa037f28d3..a6a64141a8e 100644
--- 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
diff --git a/arch/x86/power/hibernate_32.c b/arch/x86/power/hibernate_32.c
index 3769079874d..a09ecb9582b 100644
--- a/arch/x86/power/hibernate_32.c
+++ b/arch/x86/power/hibernate_32.c
@@ -130,8 +130,6 @@ static int resume_physical_mapping_init(pgd_t *pgd_base)
}
}
- resume_map_numa_kva(pgd_base);
-
return 0;
}