From: Ingo Molnar With the NUMA-zone alignment fixes NUMA on i386 has been stable for me for quite some time, so remove the panic and replace it with a printk. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton --- arch/i386/kernel/srat.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff -puN arch/i386/kernel/srat.c~x86-re-enable-generic-numa arch/i386/kernel/srat.c --- devel/arch/i386/kernel/srat.c~x86-re-enable-generic-numa 2006-05-27 23:28:57.000000000 -0700 +++ devel-akpm/arch/i386/kernel/srat.c 2006-05-27 23:28:57.000000000 -0700 @@ -312,13 +312,13 @@ int __init get_memcfg_from_srat(void) int tables = 0; int i = 0; +#ifdef CONFIG_X86_CYCLONE_TIMER 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); - } + /* make sure the user sees something */ + if (use_cyclone == 0) +#endif + printk(KERN_WARNING "WARNING: Not an IBM x440/NUMAQ and " + "CONFIG_NUMA enabled!\n"); if (ACPI_FAILURE(acpi_find_root_pointer(ACPI_PHYSICAL_ADDRESSING, rsdp_address))) { _