VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

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

diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 10f2c7c..cf61f3e 100644 (file)
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -171,8 +171,6 @@ acpi_parse_lapic_addr_ovr (
        if (BAD_MADT_ENTRY(lapic, end))
                return -EINVAL;
 
-       acpi_table_print_madt_entry(header);
-
        if (lapic->address) {
                iounmap((void *) ipi_base_addr);
                ipi_base_addr = (unsigned long) ioremap(lapic->address, 0);
@@ -191,25 +189,13 @@ acpi_parse_lsapic (acpi_table_entry_header *header, const unsigned long end)
        if (BAD_MADT_ENTRY(lsapic, end))
                return -EINVAL;
 
-       acpi_table_print_madt_entry(header);
-
-       printk(KERN_INFO "CPU %d (0x%04x)", total_cpus, (lsapic->id << 8) | lsapic->eid);
-
-       if (!lsapic->flags.enabled)
-               printk(" disabled");
-       else {
-               printk(" enabled");
+       if (lsapic->flags.enabled) {
 #ifdef CONFIG_SMP
                smp_boot_data.cpu_phys_id[available_cpus] = (lsapic->id << 8) | lsapic->eid;
-               if (hard_smp_processor_id()
-                   == (unsigned int) smp_boot_data.cpu_phys_id[available_cpus])
-                       printk(" (BSP)");
 #endif
                ++available_cpus;
        }
 
-       printk("\n");
-
        total_cpus++;
        return 0;
 }
@@ -225,8 +211,6 @@ acpi_parse_lapic_nmi (acpi_table_entry_header *header, const unsigned long end)
        if (BAD_MADT_ENTRY(lacpi_nmi, end))
                return -EINVAL;
 
-       acpi_table_print_madt_entry(header);
-
        /* TBD: Support lapic_nmi entries */
        return 0;
 }
@@ -242,8 +226,6 @@ acpi_parse_iosapic (acpi_table_entry_header *header, const unsigned long end)
        if (BAD_MADT_ENTRY(iosapic, end))
                return -EINVAL;
 
-       acpi_table_print_madt_entry(header);
-
        iosapic_init(iosapic->address, iosapic->global_irq_base);
 
        return 0;
@@ -262,8 +244,6 @@ acpi_parse_plat_int_src (
        if (BAD_MADT_ENTRY(plintsrc, end))
                return -EINVAL;
 
-       acpi_table_print_madt_entry(header);
-
        /*
         * Get vector assignment for this interrupt, set attributes,
         * and program the IOSAPIC routing table.
@@ -292,8 +272,6 @@ acpi_parse_int_src_ovr (
        if (BAD_MADT_ENTRY(p, end))
                return -EINVAL;
 
-       acpi_table_print_madt_entry(header);
-
        iosapic_override_isa_irq(p->bus_irq, p->global_irq,
                                 (p->flags.polarity == 1) ? IOSAPIC_POL_HIGH : IOSAPIC_POL_LOW,
                                 (p->flags.trigger == 1) ? IOSAPIC_EDGE : IOSAPIC_LEVEL);
@@ -311,26 +289,24 @@ acpi_parse_nmi_src (acpi_table_entry_header *header, const unsigned long end)
        if (BAD_MADT_ENTRY(nmi_src, end))
                return -EINVAL;
 
-       acpi_table_print_madt_entry(header);
-
        /* TBD: Support nimsrc entries */
        return 0;
 }
 
-/* Hook from generic ACPI tables.c */
-void __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
+static void __init
+acpi_madt_oem_check (char *oem_id, char *oem_table_id)
 {
        if (!strncmp(oem_id, "IBM", 3) &&
-           (!strncmp(oem_table_id, "SERMOW", 6))){
+           (!strncmp(oem_table_id, "SERMOW", 6))) {
 
-               /* Unfortunatly ITC_DRIFT is not yet part of the
+               /*
+                * Unfortunately ITC_DRIFT is not yet part of the
                 * official SAL spec, so the ITC_DRIFT bit is not
                 * set by the BIOS on this hardware.
                 */
                sal_platform_features |= IA64_SAL_PLATFORM_FEATURE_ITC_DRIFT;
 
-               /*Start cyclone clock*/
-               cyclone_setup(0);
+               cyclone_setup();
        }
 }
 
@@ -521,9 +497,14 @@ acpi_numa_arch_fixup (void)
 #endif /* CONFIG_ACPI_NUMA */
 
 unsigned int
-acpi_register_gsi (u32 gsi, int polarity, int trigger)
+acpi_register_gsi (u32 gsi, int edge_level, int active_high_low)
 {
-       return acpi_register_irq(gsi, polarity, trigger);
+       if (has_8259 && gsi < 16)
+               return isa_irq_to_vector(gsi);
+
+       return iosapic_register_intr(gsi,
+                       (active_high_low == ACPI_ACTIVE_HIGH) ? IOSAPIC_POL_HIGH : IOSAPIC_POL_LOW,
+                       (edge_level == ACPI_EDGE_SENSITIVE) ? IOSAPIC_EDGE : IOSAPIC_LEVEL);
 }
 EXPORT_SYMBOL(acpi_register_gsi);
 
@@ -548,7 +529,7 @@ acpi_parse_fadt (unsigned long phys_addr, unsigned long size)
        if (fadt->iapc_boot_arch & BAF_LEGACY_DEVICES)
                acpi_legacy_devices = 1;
 
-       acpi_register_gsi(fadt->sci_int, ACPI_ACTIVE_LOW, ACPI_LEVEL_SENSITIVE);
+       acpi_register_gsi(fadt->sci_int, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW);
        return 0;
 }
 
@@ -662,16 +643,4 @@ acpi_gsi_to_irq (u32 gsi, unsigned int *irq)
        return 0;
 }
 
-int
-acpi_register_irq (u32 gsi, u32 polarity, u32 trigger)
-{
-       if (has_8259 && gsi < 16)
-               return isa_irq_to_vector(gsi);
-
-       return iosapic_register_intr(gsi,
-                       (polarity == ACPI_ACTIVE_HIGH) ? IOSAPIC_POL_HIGH : IOSAPIC_POL_LOW,
-                       (trigger == ACPI_EDGE_SENSITIVE) ? IOSAPIC_EDGE : IOSAPIC_LEVEL);
-}
-EXPORT_SYMBOL(acpi_register_irq);
-
 #endif /* CONFIG_ACPI_BOOT */