From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S265207AbVBDWEh (ORCPT ); Fri, 4 Feb 2005 17:04:37 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S266359AbVBDVrq (ORCPT ); Fri, 4 Feb 2005 16:47:46 -0500 Received: from e4.ny.us.ibm.com ([32.97.182.144]:41392 "EHLO e4.ny.us.ibm.com") by vger.kernel.org with ESMTP id S264833AbVBDVGQ (ORCPT ); Fri, 4 Feb 2005 16:06:16 -0500 Subject: [PATCH 2/3] consolidate set_max_mapnr_init() implementations To: akpm@osdl.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Dave Hansen , apw@shadowen.org From: Dave Hansen Date: Fri, 04 Feb 2005 13:06:05 -0800 Message-Id: Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org discontig.c has its own version of set_max_mapnr_init(). However, all that it really does differently from the mm/init.c version is skip setting max_mapnr (which doesn't exist because there's no mem_map[]). Signed-off-by: Dave Hansen --- memhotplug-dave/arch/i386/mm/discontig.c | 9 --------- memhotplug-dave/arch/i386/mm/init.c | 11 +++++++---- 2 files changed, 7 insertions(+), 13 deletions(-) diff -puN arch/i386/mm/init.c~A1.2-cleanup-set_max_mapnr_init arch/i386/mm/init.c --- memhotplug/arch/i386/mm/init.c~A1.2-cleanup-set_max_mapnr_init 2005-02-03 11:53:39.000000000 -0800 +++ memhotplug-dave/arch/i386/mm/init.c 2005-02-03 11:53:39.000000000 -0800 @@ -567,19 +567,22 @@ static void __init test_wp_bit(void) } } -#ifndef CONFIG_DISCONTIGMEM static void __init set_max_mapnr_init(void) { #ifdef CONFIG_HIGHMEM - max_mapnr = num_physpages = highend_pfn; + num_physpages = highend_pfn; #else - max_mapnr = num_physpages = max_low_pfn; + num_physpages = max_low_pfn; +#endif +#ifndef CONFIG_DISCONTIGMEM + max_mapnr = num_physpages; #endif } + +#ifndef CONFIG_DISCONTIGMEM #define __free_all_bootmem() free_all_bootmem() #else #define __free_all_bootmem() free_all_bootmem_node(NODE_DATA(0)) -extern void set_max_mapnr_init(void); #endif /* !CONFIG_DISCONTIGMEM */ static struct kcore_list kcore_mem, kcore_vmalloc; diff -puN arch/i386/mm/discontig.c~A1.2-cleanup-set_max_mapnr_init arch/i386/mm/discontig.c --- memhotplug/arch/i386/mm/discontig.c~A1.2-cleanup-set_max_mapnr_init 2005-02-03 11:53:39.000000000 -0800 +++ memhotplug-dave/arch/i386/mm/discontig.c 2005-02-03 11:53:39.000000000 -0800 @@ -371,12 +371,3 @@ void __init set_highmem_pages_init(int b totalram_pages += totalhigh_pages; #endif } - -void __init set_max_mapnr_init(void) -{ -#ifdef CONFIG_HIGHMEM - num_physpages = highend_pfn; -#else - num_physpages = max_low_pfn; -#endif -} _