Merge branch 'acpi-processor-next' into linux-next

* acpi-processor-next:
  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

diff --cc arch/ia64/include/asm/acpi.h
index a7344f677c2c92b0fe30bbdddb434aa02fac054c,b47821931ca615c735e66118953cae7a364767b0..75dc59a793d61ce1f243526764056edd434330bf
--- 1/arch/ia64/include/asm/acpi.h
--- 2/arch/ia64/include/asm/acpi.h
+++ b/arch/ia64/include/asm/acpi.h
@@@ -34,7 -34,58 +34,8 @@@
  #include <linux/numa.h>
  #include <asm/numa.h>
  
 -#define COMPILER_DEPENDENT_INT64      long
 -#define COMPILER_DEPENDENT_UINT64     unsigned long
 -
 -/*
 - * Calling conventions:
 - *
 - * ACPI_SYSTEM_XFACE        - Interfaces to host OS (handlers, threads)
 - * ACPI_EXTERNAL_XFACE      - External ACPI interfaces
 - * ACPI_INTERNAL_XFACE      - Internal ACPI interfaces
 - * ACPI_INTERNAL_VAR_XFACE  - Internal variable-parameter list interfaces
 - */
 -#define ACPI_SYSTEM_XFACE
 -#define ACPI_EXTERNAL_XFACE
 -#define ACPI_INTERNAL_XFACE
 -#define ACPI_INTERNAL_VAR_XFACE
 -
 -/* Asm macros */
 -
 -#define ACPI_FLUSH_CPU_CACHE()
 -
 -static inline int
 -ia64_acpi_acquire_global_lock (unsigned int *lock)
 -{
 -      unsigned int old, new, val;
 -      do {
 -              old = *lock;
 -              new = (((old & ~0x3) + 2) + ((old >> 1) & 0x1));
 -              val = ia64_cmpxchg4_acq(lock, new, old);
 -      } while (unlikely (val != old));
 -      return (new < 3) ? -1 : 0;
 -}
 -
 -static inline int
 -ia64_acpi_release_global_lock (unsigned int *lock)
 -{
 -      unsigned int old, new, val;
 -      do {
 -              old = *lock;
 -              new = old & ~0x3;
 -              val = ia64_cmpxchg4_acq(lock, new, old);
 -      } while (unlikely (val != old));
 -      return old & 0x1;
 -}
 -
 -#define ACPI_ACQUIRE_GLOBAL_LOCK(facs, Acq)                           \
 -      ((Acq) = ia64_acpi_acquire_global_lock(&facs->global_lock))
 -
 -#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq)                           \
 -      ((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 */