From d47c73f3b45f9b9f17da57c1103c90cfe187e8a4 Mon Sep 17 00:00:00 2001 From: George Beshers Date: Thu, 11 Oct 2007 15:33:55 -0400 Subject: [PATCH] --- yaml --- r: 73423 b: refs/heads/master c: 7f6ff62a8f3a4e68258958196098c6f71563ae61 h: refs/heads/master i: 73421: 104d9f5741a4e6ad5d951d379539531d6bfec50c 73419: 158c474fd0beace31bcd8a5bd0f88479089a5bb9 73415: ecf5cb30c64d2b87cfb29b2a6737b95d501c750d 73407: 56ec095321a04670553efb4a9fe1f6a2558de5ab v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/acpi.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e23f6b146abc..658e6c52a9cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8de471f37dcafc8892a2e58c80764d7af221715 +refs/heads/master: 7f6ff62a8f3a4e68258958196098c6f71563ae61 diff --git a/trunk/arch/ia64/kernel/acpi.c b/trunk/arch/ia64/kernel/acpi.c index 3d45d24a9d61..897e2083a3b1 100644 --- a/trunk/arch/ia64/kernel/acpi.c +++ b/trunk/arch/ia64/kernel/acpi.c @@ -678,9 +678,11 @@ int __init acpi_boot_init(void) /* I/O APIC */ if (acpi_table_parse_madt - (ACPI_MADT_TYPE_IO_SAPIC, acpi_parse_iosapic, NR_IOSAPICS) < 1) - printk(KERN_ERR PREFIX - "Error parsing MADT - no IOSAPIC entries\n"); + (ACPI_MADT_TYPE_IO_SAPIC, acpi_parse_iosapic, NR_IOSAPICS) < 1) { + if (!ia64_platform_is("sn2")) + printk(KERN_ERR PREFIX + "Error parsing MADT - no IOSAPIC entries\n"); + } /* System-Level Interrupt Routing */