Signed-off-by: Andrew Morton --- arch/i386/Kconfig | 3 +++ arch/i386/kernel/srat.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff -puN arch/i386/Kconfig~x86_64-mm-i386-numa-summit-check arch/i386/Kconfig --- a/arch/i386/Kconfig~x86_64-mm-i386-numa-summit-check +++ a/arch/i386/Kconfig @@ -544,6 +544,9 @@ config NUMA depends on SMP && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || (X86_SUMMIT && ACPI)) default n if X86_PC default y if (X86_NUMAQ || X86_SUMMIT) + help + NUMA support. Note this only works on IBM x440 or IBM NUMAQ. + Don't try to use it anywhere else. comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI" depends on X86_SUMMIT && (!HIGHMEM64G || !ACPI) diff -puN arch/i386/kernel/srat.c~x86_64-mm-i386-numa-summit-check arch/i386/kernel/srat.c --- a/arch/i386/kernel/srat.c~x86_64-mm-i386-numa-summit-check +++ a/arch/i386/kernel/srat.c @@ -311,6 +311,14 @@ int __init get_memcfg_from_srat(void) int tables = 0; int i = 0; + extern int use_cyclone; + if (use_cyclone == 0) { + /* Make sure user sees something */ + static const char s[] __initdata = "Not an IBM x440/NUMAQ. Don't use i386 CONFIG_NUMA anywhere else."; + early_printk(s); + panic(s); + } + if (ACPI_FAILURE(acpi_find_root_pointer(ACPI_PHYSICAL_ADDRESSING, rsdp_address))) { printk("%s: System description tables not found\n", _