Re: [PATCH] x86 NUMA panic compile error

Ingo Molnar
2006-05-15T19:06:53Z

* Ingo Molnar <mingo@elte.hu> wrote:

> updated patch below. Or lets drop the original patch that adds the
> panic?

another update: s/KERN_WARN/KERN_WARNING ...

Ingo

---

re-enable dummy NUMA on i386.

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_WARNING "WARNING: Not an IBM x440/NUMAQ and CONFIG_NUMA enabled!\n");

if (ACPI_FAILURE(acpi_find_root_pointer(ACPI_PHYSICAL_ADDRESSING,
rsdp_address))) {