From mboxrd@z Thu Jan 1 00:00:00 1970 Subject: Re: [Bugme-new] [Bug 2019] New: Bug from the mm subsystem involving X (fwd) From: Dave Hansen In-Reply-To: <98220000.1076051821@[10.10.2.4]> References: <51080000.1075936626@flay> <60330000.1075939958@flay> <64260000.1075941399@flay> <20040204165620.3d608798.akpm@osdl.org> <1075946211.13163.18962.camel@dyn318004bld.beaverton.ibm.com> <98220000.1076051821@[10.10.2.4]> Content-Type: text/plain Message-Id: <1076061476.27855.1144.camel@nighthawk> Mime-Version: 1.0 Date: 06 Feb 2004 01:57:56 -0800 Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org Return-Path: To: "Martin J. Bligh" Cc: Linus Torvalds , Keith Mannthey , Andrew Morton , "linux-kernel@vger.kernel.org" , linux-mm List-ID: On Thu, 2004-02-05 at 23:17, Martin J. Bligh wrote: > +#ifdef CONFIG_NUMA > + #ifdef CONFIG_X86_NUMAQ > + #include > + #else /* summit or generic arch */ > + #include > + #endif > +#else /* !CONFIG_NUMA */ > + #define get_memcfg_numa get_memcfg_numa_flat > + #define get_zholes_size(n) (0) > +#endif /* CONFIG_NUMA */ We ran into a bug with #ifdefs like this before. It was fixed in some of the code that you're trying to remove. It's not safe to assume that NUMA && !NUMAQ means SUMMIT. Remember the linking errors we got when we turned CONFIG_NUMA on with the regular PC config? The generic arch wasn't a problem because it sets CONFIG_X86_SUMMIT and compiles in the summit code, but the regular PC code doesn't. Also, I don't think we need the #ifdef CONFIG_NUMA around the whole block. How about something like this? #ifdef CONFIG_X86_NUMAQ #include #elif CONFIG_X86_SUMMIT #include #else #define get_memcfg_numa get_memcfg_numa_flat #define get_zholes_size(n) (0) #endif /* CONFIG_NUMA */ > +static inline int pfn_to_nid(unsigned long pfn) > +{ > +#ifdef CONFIG_NUMA > + return(physnode_map[(pfn) / PAGES_PER_ELEMENT]); > +#else > + return 0; > +#endif > +} Looks like somebody pasted that in from a macro. "(pfn)" :) --dave -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: aart@kvack.org