Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B

[linux-2.6-omap-h63xx.git] / include / asm-x86 / apic.h

diff --git a/include/asm-x86/apic.h b/include/asm-x86/apic.h
index bc2e364bdb1007c12a4c22e3a8e48a14393eef61..d76a0839abe932c789738f0b0ec5b81c79f96b6c 100644 (file)
--- a/include/asm-x86/apic.h
+++ b/include/asm-x86/apic.h
@@ -54,6 +54,11 @@ extern int disable_apic;
 #endif
 
 extern int is_vsmp_box(void);
+extern void xapic_wait_icr_idle(void);
+extern u32 safe_xapic_wait_icr_idle(void);
+extern u64 xapic_icr_read(void);
+extern void xapic_icr_write(u32, u32);
+extern int setup_profiling_timer(unsigned int);
 
 static inline void native_apic_mem_write(u32 reg, u32 v)
 {
@@ -129,9 +134,7 @@ static inline void ack_x2APIC_irq(void)
 static inline void ack_APIC_irq(void)
 {
        /*
-        * ack_APIC_irq() actually gets compiled as a single instruction:
-        * - a single rmw on Pentium/82489DX
-        * - a single write on P6+ cores (CONFIG_X86_GOOD_APIC)
+        * ack_APIC_irq() actually gets compiled as a single instruction
         * ... yummie.
         */