From mboxrd@z Thu Jan 1 00:00:00 1970 Date: Fri, 06 Feb 2004 11:59:50 -0800 From: "Martin J. Bligh" Subject: Re: [Bugme-new] [Bug 2019] New: Bug from the mm subsystem involving X (fwd) Message-ID: <218650000.1076097590@flay> In-Reply-To: <1076088169.29478.2928.camel@nighthawk> 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]> <1076061476.27855.1144.camel@nighthawk> <5450000.1076082574@[10.10.2.4]> <1076088169.29478.2928.camel@nighthawk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline Sender: owner-linux-mm@kvack.org Return-Path: To: Dave Hansen Cc: Linus Torvalds , Keith Mannthey , Andrew Morton , "linux-kernel@vger.kernel.org" , linux-mm , Andi Kleen List-ID: --On Friday, February 06, 2004 09:22:49 -0800 Dave Hansen wrote: > On Fri, 2004-02-06 at 07:49, 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. >> >> What bug? > > With a regular PC config, plus CONFIG_NUMA turned on: Ah ... that's the problem. That's not a valid config - the correct way to do that is with generic arch, not the PC one. Somehow we ended up leaving that as allowable ... I think that was just a communiciation breakdown somewhere between you, Andi, and myself (or quite possibly between myself and myself ;-)). So ... I still think my original patch is correct (there's some stylistic stuff we could debate, but it's not a functional problem). Here's an additional patch that stops people from turning on NUMA for the PC subarch, which it wasn't designed to work with. Thanks, M. ------------------------------------------------------------- Disallow NUMA on the i386 PC subarch (it doesn't work, nor was it intended to). diff -purN -X /home/mbligh/.diff.exclude pfn_to_nid/arch/i386/Kconfig pc_numa/arch/i386/Kconfig --- pfn_to_nid/arch/i386/Kconfig 2004-02-04 16:23:49.000000000 -0800 +++ pc_numa/arch/i386/Kconfig 2004-02-06 11:16:19.000000000 -0800 @@ -701,7 +701,7 @@ config X86_PAE # Common NUMA Features config NUMA bool "Numa Memory Allocation Support" - depends on SMP && HIGHMEM64G && (X86_PC || X86_NUMAQ || X86_GENERICARCH || (X86_SUMMIT && ACPI && !ACPI_HT_ONLY)) + depends on SMP && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || (X86_SUMMIT && ACPI && !ACPI_HT_ONLY)) default n if X86_PC default y if (X86_NUMAQ || X86_SUMMIT) -- 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