Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4694516d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Linus Torvalds
Browse files

x86: Make NUMA on 32-bit depend on BROKEN 

While investigating the failure of hibernation on 32-bit x86 with
CONFIG_NUMA set, as described in this message
http://marc.info/?l=linux-kernel&m=122634118116226&w=4


I asked some people for help and I was told that it wasn't really
worth the effort, because CONFIG_NUMA was generally broken on 32-bit
x86 systems and it shouldn't be used in such configs.  For this
reason, make CONFIG_NUMA depend on BROKEN instead of EXPERIMENTAL on
x86-32.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Pavel Machek <pavel@suse.cz>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1f8f5cf6

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -957,7 +957,7 @@ config ARCH_PHYS_ADDR_T_64BIT 
config NUMA

	bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"

	depends on SMP

	depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL)

	depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && BROKEN)

	default n if X86_PC

	default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP)

	help