diff --git a/[refs] b/[refs] index 997a2f3b4142..4f2749ba571a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f03574f2d5b2d6229dcdf2d322848065f72953c7 +refs/heads/master: bb112aec5ee41427e9b9726e3d57b896709598ed diff --git a/trunk/arch/x86/include/asm/mmzone_32.h b/trunk/arch/x86/include/asm/mmzone_32.h index eb05fb3b02fb..8a9b3e288cb4 100644 --- a/trunk/arch/x86/include/asm/mmzone_32.h +++ b/trunk/arch/x86/include/asm/mmzone_32.h @@ -14,12 +14,6 @@ extern struct pglist_data *node_data[]; #include -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/trunk/arch/x86/power/hibernate_32.c b/trunk/arch/x86/power/hibernate_32.c index 74202c1910cd..7d28c885d238 100644 --- a/trunk/arch/x86/power/hibernate_32.c +++ b/trunk/arch/x86/power/hibernate_32.c @@ -129,8 +129,6 @@ static int resume_physical_mapping_init(pgd_t *pgd_base) } } - resume_map_numa_kva(pgd_base); - return 0; }