Messages in this thread Patch in this message | | | Date | Mon, 15 May 2006 20:56:57 +0200 | From | Ingo Molnar <> | Subject | Re: [PATCH] x86 NUMA panic compile error |
| |
* Andrew Morton <akpm@osdl.org> wrote:
> If we didn't do this lazy-ass put-the-declaration-in-the-C-file thing, > we'd have noticed that the declaration of use_cyclone is in > include/asm-i386/mach-summit/mach_mpparse.h.
updated patch below. Or lets drop the original patch that adds the panic?
Ingo
---
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/i386/kernel/srat.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
Index: linux/arch/i386/kernel/srat.c =================================================================== --- linux.orig/arch/i386/kernel/srat.c +++ linux/arch/i386/kernel/srat.c @@ -266,13 +266,12 @@ 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 user sees something */ + if (use_cyclone == 0) +#endif + printk(KERN_WARN "WARNING: Not an IBM x440/NUMAQ and CONFIG_NUMA enabled!\n"); if (ACPI_FAILURE(acpi_find_root_pointer(ACPI_PHYSICAL_ADDRESSING, rsdp_address))) { - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |