This commit was manufactured by cvs2svn to create tag

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

diff --git a/include/asm-i386/apic.h b/include/asm-i386/apic.h
index e1de674..8135c7c 100644 (file)
--- a/include/asm-i386/apic.h
+++ b/include/asm-i386/apic.h
@@ -53,8 +53,7 @@ static __inline unsigned long apic_read(unsigned long reg)
 
 static __inline__ void apic_wait_icr_idle(void)
 {
-       while ( apic_read( APIC_ICR ) & APIC_ICR_BUSY )
-               cpu_relax();
+       do { } while ( apic_read( APIC_ICR ) & APIC_ICR_BUSY );
 }
 
 int get_physical_broadcast(void);
@@ -89,7 +88,6 @@ extern void clear_local_APIC(void);
 extern void connect_bsp_APIC (void);
 extern void disconnect_bsp_APIC (void);
 extern void disable_local_APIC (void);
-extern void lapic_shutdown (void);
 extern int verify_local_APIC (void);
 extern void cache_APIC_registers (void);
 extern void sync_Arb_IDs (void);
@@ -118,9 +116,6 @@ extern unsigned int nmi_watchdog;
 #define NMI_LOCAL_APIC 2
 #define NMI_INVALID    3
 
-#else /* !CONFIG_X86_LOCAL_APIC */
-static inline void lapic_shutdown(void) { }
-
-#endif /* !CONFIG_X86_LOCAL_APIC */
+#endif /* CONFIG_X86_LOCAL_APIC */
 
 #endif /* __ASM_APIC_H */