vserver 1.9.5.x5

[linux-2.6.git] / include / asm-i386 / system.h

diff --git a/include/asm-i386/system.h b/include/asm-i386/system.h
index 6b1d2e8..c705fa7 100644 (file)
--- a/include/asm-i386/system.h
+++ b/include/asm-i386/system.h
@@ -321,7 +321,7 @@ struct alt_instr {
  * If you use variable sized constraints like "m" or "g" in the 
  * replacement maake sure to pad to the worst case length.
  */
-#define alternative_input(oldinstr, newinstr, feature, input)                  \
+#define alternative_input(oldinstr, newinstr, feature, input...)               \
        asm volatile ("661:\n\t" oldinstr "\n662:\n"                            \
                      ".section .altinstructions,\"a\"\n"                       \
                      "  .align 4\n"                                            \
@@ -333,7 +333,7 @@ struct alt_instr {
                      ".previous\n"                                             \
                      ".section .altinstr_replacement,\"ax\"\n"                 \
                      "663:\n\t" newinstr "\n664:\n"   /* replacement */        \
-                     ".previous" :: "i" (feature), input)  
+                     ".previous" :: "i" (feature), ##input)
 
 /*
  * Force strict CPU ordering.
@@ -465,13 +465,7 @@ struct alt_instr {
 void disable_hlt(void);
 void enable_hlt(void);
 
-extern unsigned long dmi_broken;
-extern int is_sony_vaio_laptop;
 extern int es7000_plat;
-
-#define BROKEN_ACPI_Sx         0x0001
-#define BROKEN_INIT_AFTER_S1   0x0002
-#define BROKEN_PNP_BIOS                0x0004
-#define BROKEN_CPUFREQ         0x0008
+void cpu_idle_wait(void);
 
 #endif