Return-Path: Date: Thu, 31 Jan 2013 14:40:29 -0800 From: "tip-bot for H. Peter Anvin" Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, dave@linux.vnet.ibm.com, stable@vger.kernel.org, tglx@linutronix.de, hpa@linux.intel.com Reply-To: mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, dave@linux.vnet.ibm.com, tglx@linutronix.de, stable@vger.kernel.org, hpa@linux.intel.com In-Reply-To: <20130131005616.1C79F411@kernel.stglabs.ibm.com> References: <20130131005616.1C79F411@kernel.stglabs.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86-32, mm: Remove reference to resume_map_numa_kva( ) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: Commit-ID: bb112aec5ee41427e9b9726e3d57b896709598ed Gitweb: http://git.kernel.org/tip/bb112aec5ee41427e9b9726e3d57b896709598ed Author: H. Peter Anvin AuthorDate: Thu, 31 Jan 2013 13:53:10 -0800 Committer: H. Peter Anvin CommitDate: Thu, 31 Jan 2013 14:12:30 -0800 x86-32, mm: Remove reference to resume_map_numa_kva() Remove reference to removed function resume_map_numa_kva(). Signed-off-by: H. Peter Anvin Cc: Dave Hansen Cc: Link: http://lkml.kernel.org/r/20130131005616.1C79F411@kernel.stglabs.ibm.com --- arch/x86/include/asm/mmzone_32.h | 6 ------ arch/x86/power/hibernate_32.c | 2 -- 2 files changed, 8 deletions(-) diff --git a/arch/x86/include/asm/mmzone_32.h b/arch/x86/include/asm/mmzone_32.h index eb05fb3..8a9b3e2 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 -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 74202c1..7d28c88 100644 --- a/arch/x86/power/hibernate_32.c +++ b/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; }