Remove some unused variables

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

diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 9ea5b8ecc7e1d61918da7043a15b55400c121735..a574cd2c8b61c5ac1ec273b1a7741f1868611abc 100644 (file)
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -621,8 +621,6 @@ static int __init acpi_parse_sbf(struct acpi_table_header *table)
 static int __init acpi_parse_hpet(struct acpi_table_header *table)
 {
        struct acpi_table_hpet *hpet_tbl;
-       struct resource *hpet_res;
-       resource_size_t res_start;
 
        hpet_tbl = (struct acpi_table_hpet *)table;
        if (!hpet_tbl) {
@@ -636,29 +634,10 @@ static int __init acpi_parse_hpet(struct acpi_table_header *table)
                return -1;
        }
 
-#define HPET_RESOURCE_NAME_SIZE 9
-       hpet_res = alloc_bootmem(sizeof(*hpet_res) + HPET_RESOURCE_NAME_SIZE);
-       if (hpet_res) {
-               memset(hpet_res, 0, sizeof(*hpet_res));
-               hpet_res->name = (void *)&hpet_res[1];
-               hpet_res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
-               snprintf((char *)hpet_res->name, HPET_RESOURCE_NAME_SIZE,
-                        "HPET %u", hpet_tbl->sequence);
-               hpet_res->end = (1 * 1024) - 1;
-       }
-
        hpet_address = hpet_tbl->address.address;
        printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",
               hpet_tbl->id, hpet_address);
 
-       res_start = hpet_address;
-
-       if (hpet_res) {
-               hpet_res->start = res_start;
-               hpet_res->end += res_start;
-               insert_resource(&iomem_resource, hpet_res);
-       }
-
        return 0;
 }
 #else
@@ -874,7 +853,7 @@ static void __init acpi_process_madt(void)
                                acpi_ioapic = 1;
 
                                smp_found_config = 1;
-                               clustered_apic_check();
+                               setup_apic_routing();
                        }
                }
                if (error == -EINVAL) {