ia64: remove support for the SGI SN2 platform

[sfrench/cifs-2.6.git] / arch / ia64 / kernel / acpi.c

diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index c597ab5275b8ef268f50dfbe20e7f4bdeff75317..a63e472f5317f8673549f2113f272e78c5314174 100644 (file)
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -96,8 +96,6 @@ acpi_get_sysname(void)
        } else if (!strcmp(hdr->oem_id, "SGI")) {
                if (!strcmp(hdr->oem_table_id + 4, "UV"))
                        return "uv";
-               else
-                       return "sn2";
        }
 
 #ifdef CONFIG_INTEL_IOMMU
@@ -407,7 +405,7 @@ get_processor_proximity_domain(struct acpi_srat_cpu_affinity *pa)
        int pxm;
 
        pxm = pa->proximity_domain_lo;
-       if (ia64_platform_is("sn2") || acpi_srat_revision >= 2)
+       if (acpi_srat_revision >= 2)
                pxm += pa->proximity_domain_hi[0] << 8;
        return pxm;
 }
@@ -418,7 +416,7 @@ get_memory_proximity_domain(struct acpi_srat_mem_affinity *ma)
        int pxm;
 
        pxm = ma->proximity_domain;
-       if (!ia64_platform_is("sn2") && acpi_srat_revision <= 1)
+       if (acpi_srat_revision <= 1)
                pxm &= 0xff;
 
        return pxm;
@@ -710,9 +708,8 @@ int __init acpi_boot_init(void)
 
        if (acpi_table_parse_madt
            (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");
+               printk(KERN_ERR PREFIX
+                      "Error parsing MADT - no IOSAPIC entries\n");
        }
 
        /* System-Level Interrupt Routing */