Pull acpica into release branch

diff --combined arch/i386/kernel/acpi/boot.c
index 40e5aba,a6fe912..7ff6f9d
--- 1/arch/i386/kernel/acpi/boot.c
--- 2/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@@ -621,9 -621,9 +621,9 @@@ extern u32 pmtmr_ioport
  
  static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
  {
-       struct fadt_descriptor_rev2 *fadt = NULL;
+       struct fadt_descriptor *fadt = NULL;
  
-       fadt = (struct fadt_descriptor_rev2 *)__acpi_map_table(phys, size);
+       fadt = (struct fadt_descriptor *)__acpi_map_table(phys, size);
        if (!fadt) {
                printk(KERN_WARNING PREFIX "Unable to map FADT\n");
                return 0;
@@@ -693,9 -693,6 +693,9 @@@ static int __init acpi_parse_madt_lapic
  {
        int count;
  
 +      if (!cpu_has_apic)
 +              return -ENODEV;
 +
        /* 
         * Note that the LAPIC address is obtained from the MADT (32-bit value)
         * and (optionally) overriden by a LAPIC_ADDR_OVR entry (64-bit value).
@@@ -754,9 -751,6 +754,9 @@@ static int __init acpi_parse_madt_ioapi
                return -ENODEV;
        }
  
 +      if (!cpu_has_apic)
 +              return -ENODEV;
 +
        /*
         * if "noapic" boot option, don't look for IO-APICs
         */

diff --combined drivers/acpi/ec.c
index eee0864,1e32227..80cc76d
--- 1/drivers/acpi/ec.c
--- 2/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@@ -763,8 -763,7 +763,7 @@@ static u32 acpi_ec_gpe_poll_handler(voi
  
        acpi_disable_gpe(NULL, ec->common.gpe_bit, ACPI_ISR);
  
-       status = acpi_os_queue_for_execution(OSD_PRIORITY_GPE,
-                                            acpi_ec_gpe_query, ec);
+       status = acpi_os_execute(OSL_EC_POLL_HANDLER, acpi_ec_gpe_query, ec);
  
        if (status == AE_OK)
                return ACPI_INTERRUPT_HANDLED;
@@@ -799,7 -798,7 +798,7 @@@ static u32 acpi_ec_gpe_intr_handler(voi
  
        if (value & ACPI_EC_FLAG_SCI) {
                atomic_add(1, &ec->intr.pending_gpe);
-               status = acpi_os_queue_for_execution(OSD_PRIORITY_GPE,
+               status = acpi_os_execute(OSL_EC_BURST_HANDLER,
                                                     acpi_ec_gpe_query, ec);
                return status == AE_OK ?
                    ACPI_INTERRUPT_HANDLED : ACPI_INTERRUPT_NOT_HANDLED;
@@@ -1572,7 -1571,7 +1571,7 @@@ static void __exit acpi_ec_exit(void
  static int __init acpi_fake_ecdt_setup(char *str)
  {
        acpi_fake_ecdt_enabled = 1;
 -      return 0;
 +      return 1;
  }
  
  __setup("acpi_fake_ecdt", acpi_fake_ecdt_setup);
@@@ -1591,7 -1590,7 +1590,7 @@@ static int __init acpi_ec_set_intr_mode
                acpi_ec_driver.ops.add = acpi_ec_poll_add;
        }
        printk(KERN_INFO PREFIX "EC %s mode.\n", intr ? "interrupt" : "polling");
 -      return 0;
 +      return 1;
  }
  
  __setup("ec_intr=", acpi_ec_set_intr_mode);