From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756806AbZCCMPz (ORCPT ); Tue, 3 Mar 2009 07:15:55 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751183AbZCCMPq (ORCPT ); Tue, 3 Mar 2009 07:15:46 -0500 Received: from mx3.mail.elte.hu ([157.181.1.138]:46068 "EHLO mx3.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750768AbZCCMPq (ORCPT ); Tue, 3 Mar 2009 07:15:46 -0500 Date: Tue, 3 Mar 2009 13:15:32 +0100 From: Ingo Molnar To: Pekka Enberg Cc: linux-kernel@vger.kernel.org, x86@kernel.org Subject: Re: [PATCH] x86: set_highmem_pages_init() cleanup Message-ID: <20090303121532.GC5740@elte.hu> References: <1236082212.2675.24.camel@penberg-laptop> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1236082212.2675.24.camel@penberg-laptop> User-Agent: Mutt/1.5.18 (2008-05-17) X-ELTE-VirusStatus: clean X-ELTE-SpamScore: -1.5 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-1.5 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.3 -1.5 BAYES_00 BODY: Bayesian spam probability is 0 to 1% [score: 0.0000] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Pekka Enberg wrote: > From: Pekka Enberg > > Impact: cleanup > > This patch moves set_highmem_pages_init() to arch/x86/mm/highmem_32.c. The > declaration of the function is kept in asm/numa_32.h because asm/highmem.h is > included only CONFIG_HIGHMEM is enabled so we can't put the empty static inline > function there. > > Signed-off-by: Pekka Enberg > --- > arch/x86/include/asm/numa_32.h | 6 +++++- > arch/x86/mm/highmem_32.c | 34 ++++++++++++++++++++++++++++++++++ > arch/x86/mm/init_32.c | 12 ------------ > arch/x86/mm/numa_32.c | 26 -------------------------- > 4 files changed, 39 insertions(+), 39 deletions(-) Applied, thanks! One question: > diff --git a/arch/x86/include/asm/numa_32.h b/arch/x86/include/asm/numa_32.h > index e9f5db7..a372290 100644 > --- a/arch/x86/include/asm/numa_32.h > +++ b/arch/x86/include/asm/numa_32.h > @@ -4,8 +4,12 @@ > extern int pxm_to_nid(int pxm); > extern void numa_remove_cpu(int cpu); > > -#ifdef CONFIG_NUMA > +#ifdef CONFIG_HIGHMEM > extern void set_highmem_pages_init(void); > +#else > +static inline void set_highmem_pages_init(void) > +{ > +} > #endif > > #endif /* _ASM_X86_NUMA_32_H */ > diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c > index bcc079c..13a823c 100644 > --- a/arch/x86/mm/highmem_32.c > +++ b/arch/x86/mm/highmem_32.c > @@ -1,5 +1,6 @@ > #include > #include > +#include /* for totalram_pages */ > > void *kmap(struct page *page) > { > @@ -156,3 +157,36 @@ EXPORT_SYMBOL(kmap); > EXPORT_SYMBOL(kunmap); > EXPORT_SYMBOL(kmap_atomic); > EXPORT_SYMBOL(kunmap_atomic); > + > +#ifdef CONFIG_NUMA > +void __init set_highmem_pages_init(void) > +{ > + struct zone *zone; > + int nid; > + > + for_each_zone(zone) { > + unsigned long zone_start_pfn, zone_end_pfn; > + > + if (!is_highmem(zone)) > + continue; > + > + zone_start_pfn = zone->zone_start_pfn; > + zone_end_pfn = zone_start_pfn + zone->spanned_pages; > + > + nid = zone_to_nid(zone); > + printk(KERN_INFO "Initializing %s for node %d (%08lx:%08lx)\n", > + zone->name, nid, zone_start_pfn, zone_end_pfn); > + > + add_highpages_with_active_regions(nid, zone_start_pfn, > + zone_end_pfn); > + } > + totalram_pages += totalhigh_pages; > +} > +#else > +static void __init set_highmem_pages_init(void) > +{ > + add_highpages_with_active_regions(0, highstart_pfn, highend_pfn); > + > + totalram_pages += totalhigh_pages; > +} > +#endif /* CONFIG_NUMA */ Couldnt we just wrap the !NUMA case into the NUMA case and just have the NUMA function present, by making for_each_zone() a two-entries matter and making the second entry contain: zone->zone_start_pfn := highstart_pfn zone->spanned_pages := highend_pfn-highstart_pfn ? Ingo