Merge branch 'core/locking' into core/urgent

[linux-2.6] / include / asm-x86 / acpi.h

diff --git a/include/asm-x86/acpi.h b/include/asm-x86/acpi.h
index 7a72d6aa50be85527b904fbbfe815c0701760d77..635d764dc13e346e26dc6f27b8a45d5701a9c55b 100644 (file)
--- a/include/asm-x86/acpi.h
+++ b/include/asm-x86/acpi.h
@@ -28,6 +28,7 @@
 #include <asm/numa.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
+#include <asm/mpspec.h>
 
 #define COMPILER_DEPENDENT_INT64   long long
 #define COMPILER_DEPENDENT_UINT64  unsigned long long
@@ -67,16 +68,16 @@ int __acpi_release_global_lock(unsigned int *lock);
  */
 #define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \
        asm("divl %2;"                               \
-           :"=a"(q32), "=d"(r32)                    \
-           :"r"(d32),                               \
+           : "=a"(q32), "=d"(r32)                   \
+           : "r"(d32),                              \
             "0"(n_lo), "1"(n_hi))
 
 
 #define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \
        asm("shrl   $1,%2       ;"      \
            "rcrl   $1,%3;"             \
-           :"=r"(n_hi), "=r"(n_lo)     \
-           :"0"(n_hi), "1"(n_lo))
+           : "=r"(n_hi), "=r"(n_lo)    \
+           : "0"(n_hi), "1"(n_lo))
 
 #ifdef CONFIG_ACPI
 extern int acpi_lapic;
@@ -160,9 +161,7 @@ struct bootnode;
 #ifdef CONFIG_ACPI_NUMA
 extern int acpi_numa;
 extern int acpi_scan_nodes(unsigned long start, unsigned long end);
-#ifdef CONFIG_X86_64
-# define NR_NODE_MEMBLKS (MAX_NUMNODES*2)
-#endif
+#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)
 extern void acpi_fake_nodes(const struct bootnode *fake_nodes,
                                   int num_nodes);
 #else