Merge branches 'acpi-processor' and 'acpi-pad'

* acpi-processor:
  ACPI / processor: Fix STARTING/DYING action in acpi_cpu_soft_notify()
  ACPI / processor: Check if LAPIC is present during initialization
  ACPI / ia64: introduce variable acpi_lapic into ia64

* acpi-pad:
  ACPI / PAD: Use time_before() for time comparison
  ACPI / PAD: call schedule() when need_resched() is true

diff --combined arch/ia64/include/asm/acpi.h
index 97cb16086314b6afe74a2870f322acba795b9842,b47821931ca615c735e66118953cae7a364767b0,d651102a4d4579434ce01fe3bd6f27c9108629c9..2e73dffa16af2ef69e30e9d5bb602442d9b34eb1
--- 1/arch/ia64/include/asm/acpi.h
--- 2/arch/ia64/include/asm/acpi.h
--- 3/arch/ia64/include/asm/acpi.h
+++ b/arch/ia64/include/asm/acpi.h
@@@@ -85,6 -85,7 -85,6 +85,7 @@@@ ia64_acpi_release_global_lock (unsigne
        ((Acq) = ia64_acpi_release_global_lock(&facs->global_lock))
   
   #ifdef       CONFIG_ACPI
+ +extern int acpi_lapic;
   #define acpi_disabled 0      /* ACPI always enabled on IA64 */
   #define acpi_noirq 0 /* ACPI always enabled on IA64 */
   #define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */
@@@@ -92,6 -93,7 -92,7 +93,6 @@@@
   #endif
   #define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */
   static inline void disable_acpi(void) { }
 --static inline void pci_acpi_crs_quirks(void) { }
   
   #ifdef CONFIG_IA64_GENERIC
   const char *acpi_get_sysname (void);