ide: remove static prototypes from include/asm-mips/mach-au1x00/au1xxx_ide.h

[linux-2.6-omap-h63xx.git] / include / asm-x86_64 / pda.h

diff --git a/include/asm-x86_64/pda.h b/include/asm-x86_64/pda.h
index c2aac96ac3230a9746ee97c190d62db371afabab..5642634843c472921ec08802fda4f36ca6a0ce1b 100644 (file)
--- a/include/asm-x86_64/pda.h
+++ b/include/asm-x86_64/pda.h
@@ -25,7 +25,8 @@ struct x8664_pda {
        int nodenumber;             /* number of current node */
        unsigned int __softirq_pending;
        unsigned int __nmi_count;       /* number of NMI on this CPUs */
-       int mmu_state;     
+       short mmu_state;
+       short isidle;
        struct mm_struct *active_mm;
        unsigned apic_timer_irqs;
 } ____cacheline_aligned_in_smp;
@@ -39,53 +40,84 @@ extern struct x8664_pda boot_cpu_pda[];
  * There is no fast way to get the base address of the PDA, all the accesses
  * have to mention %fs/%gs.  So it needs to be done this Torvaldian way.
  */ 
-extern void __bad_pda_field(void);
+extern void __bad_pda_field(void) __attribute__((noreturn));
 
-/* proxy_pda doesn't actually exist, but tell gcc it is accessed
-   for all PDA accesses so it gets read/write dependencies right. */
+/*
+ * proxy_pda doesn't actually exist, but tell gcc it is accessed for
+ * all PDA accesses so it gets read/write dependencies right.
+ */
 extern struct x8664_pda _proxy_pda;
 
 #define pda_offset(field) offsetof(struct x8664_pda, field)
 
-#define pda_to_op(op,field,val) do { \
-       typedef typeof(_proxy_pda.field) T__; \
-       switch (sizeof(_proxy_pda.field)) {             \
-case 2: \
-asm(op "w %1,%%gs:%c2" : "+m" (_proxy_pda.field) : \
-       "ri" ((T__)val),"i"(pda_offset(field))); break; \
-case 4: \
-asm(op "l %1,%%gs:%c2" : "+m" (_proxy_pda.field) : \
-       "ri" ((T__)val),"i"(pda_offset(field))); break; \
-case 8: \
-asm(op "q %1,%%gs:%c2": "+m" (_proxy_pda.field) : \
-        "ri" ((T__)val),"i"(pda_offset(field))); break; \
-default: __bad_pda_field();                                    \
-       } \
+#define pda_to_op(op,field,val) do {           \
+       typedef typeof(_proxy_pda.field) T__;   \
+       if (0) { T__ tmp__; tmp__ = (val); }    /* type checking */ \
+       switch (sizeof(_proxy_pda.field)) {     \
+       case 2:                                 \
+               asm(op "w %1,%%gs:%c2" :        \
+                   "+m" (_proxy_pda.field) :   \
+                   "ri" ((T__)val),            \
+                   "i"(pda_offset(field)));    \
+               break;                          \
+       case 4:                                 \
+               asm(op "l %1,%%gs:%c2" :        \
+                   "+m" (_proxy_pda.field) :   \
+                   "ri" ((T__)val),            \
+                   "i" (pda_offset(field)));   \
+               break;                          \
+       case 8:                                 \
+               asm(op "q %1,%%gs:%c2":         \
+                   "+m" (_proxy_pda.field) :   \
+                   "ri" ((T__)val),            \
+                   "i"(pda_offset(field)));    \
+               break;                          \
+       default:                                \
+               __bad_pda_field();              \
+       }                                       \
        } while (0)
 
-#define pda_from_op(op,field) ({ \
-       typeof(_proxy_pda.field) ret__; \
-       switch (sizeof(_proxy_pda.field)) {             \
-case 2: \
-asm(op "w %%gs:%c1,%0":"=r" (ret__):\
-       "i" (pda_offset(field)), "m" (_proxy_pda.field)); break;\
-case 4: \
-asm(op "l %%gs:%c1,%0":"=r" (ret__):\
-       "i" (pda_offset(field)), "m" (_proxy_pda.field)); break;\
-case 8: \
-asm(op "q %%gs:%c1,%0":"=r" (ret__):\
-       "i" (pda_offset(field)), "m" (_proxy_pda.field)); break;\
-default: __bad_pda_field();                                    \
-       } \
+#define pda_from_op(op,field) ({               \
+       typeof(_proxy_pda.field) ret__;         \
+       switch (sizeof(_proxy_pda.field)) {     \
+               case 2:                                 \
+               asm(op "w %%gs:%c1,%0" :        \
+                   "=r" (ret__) :              \
+                   "i" (pda_offset(field)),    \
+                   "m" (_proxy_pda.field));    \
+                break;                         \
+       case 4:                                 \
+               asm(op "l %%gs:%c1,%0":         \
+                   "=r" (ret__):               \
+                   "i" (pda_offset(field)),    \
+                   "m" (_proxy_pda.field));    \
+                break;                         \
+       case 8:                                 \
+               asm(op "q %%gs:%c1,%0":         \
+                   "=r" (ret__) :              \
+                   "i" (pda_offset(field)),    \
+                   "m" (_proxy_pda.field));    \
+                break;                         \
+       default:                                \
+               __bad_pda_field();              \
+       }                                       \
        ret__; })
 
-
 #define read_pda(field) pda_from_op("mov",field)
 #define write_pda(field,val) pda_to_op("mov",field,val)
 #define add_pda(field,val) pda_to_op("add",field,val)
 #define sub_pda(field,val) pda_to_op("sub",field,val)
 #define or_pda(field,val) pda_to_op("or",field,val)
 
+/* This is not atomic against other CPUs -- CPU preemption needs to be off */
+#define test_and_clear_bit_pda(bit,field) ({           \
+       int old__;                                              \
+       asm volatile("btr %2,%%gs:%c3\n\tsbbl %0,%0"            \
+           : "=r" (old__), "+m" (_proxy_pda.field)             \
+           : "dIr" (bit), "i" (pda_offset(field)) : "memory"); \
+       old__;                                                  \
+})
+
 #endif
 
 #define PDA_STACKOFFSET (5*8)