x86: define PTE_MASK in a universally useful way

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

diff --git a/include/asm-x86/acpi.h b/include/asm-x86/acpi.h
index c477e574175114ef2df532efb38f4b5ae191801e..14411c9de46f8f1f22434759c91b4ad892d17227 100644 (file)
--- a/include/asm-x86/acpi.h
+++ b/include/asm-x86/acpi.h
@@ -27,6 +27,7 @@
 
 #include <asm/numa.h>
 #include <asm/processor.h>
+#include <asm/mmu.h>
 
 #define COMPILER_DEPENDENT_INT64   long long
 #define COMPILER_DEPENDENT_UINT64  unsigned long long
@@ -66,16 +67,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;
@@ -88,6 +89,10 @@ extern int acpi_pci_disabled;
 extern int acpi_skip_timer_override;
 extern int acpi_use_timer_override;
 
+extern u8 acpi_sci_flags;
+extern int acpi_sci_override_gsi;
+void acpi_pic_sci_set_trigger(unsigned int, u16);
+
 static inline void disable_acpi(void)
 {
        acpi_disabled = 1;
@@ -158,7 +163,7 @@ extern int acpi_scan_nodes(unsigned long start, unsigned long end);
 #ifdef CONFIG_X86_64
 # define NR_NODE_MEMBLKS (MAX_NUMNODES*2)
 #endif
-extern void __init acpi_fake_nodes(const struct bootnode *fake_nodes,
+extern void acpi_fake_nodes(const struct bootnode *fake_nodes,
                                   int num_nodes);
 #else
 static inline void acpi_fake_nodes(const struct bootnode *fake_nodes,
@@ -167,4 +172,6 @@ static inline void acpi_fake_nodes(const struct bootnode *fake_nodes,
 }
 #endif
 
+#define acpi_unlazy_tlb(x)     leave_mm(x)
+
 #endif /*__X86_ASM_ACPI_H*/