xnu-4903.221.2.tar.gz

[apple/xnu.git] / osfmk / i386 / machine_cpu.h

diff --git a/osfmk/i386/machine_cpu.h b/osfmk/i386/machine_cpu.h
index b25a41f11e1930c5b59bddd619c299e09050d78a..c193948e1e7d97f63b3468743cbb30c32bb21ee0 100644 (file)
--- a/osfmk/i386/machine_cpu.h
+++ b/osfmk/i386/machine_cpu.h
@@ -38,9 +38,10 @@ __BEGIN_DECLS
 void   cpu_machine_init(
        void);
 
-struct i386_interrupt_state;
-void   cpu_signal_handler(
-       struct i386_interrupt_state *regs);
+void   handle_pending_TLB_flushes(
+       void);
+
+int cpu_signal_handler(x86_saved_state_t *regs);
 
 kern_return_t cpu_register(
         int *slot_nump);
@@ -48,12 +49,12 @@ __END_DECLS
 
 static inline void cpu_halt(void)
 {
-       asm volatile( "cli; hlt" );
+       asm volatile( "wbinvd; cli; hlt" );
 }
 
 static inline void cpu_pause(void)
 {
-       asm volatile( "rep; nop" );
+       __builtin_ia32_pause();
 }
 
 #endif /* _I386_MACHINE_CPU_H_ */