X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/4452a7af2eac33dbad800bcc91f2399d62c18f53..HEAD:/osfmk/i386/machine_cpu.h

diff --git a/osfmk/i386/machine_cpu.h b/osfmk/i386/machine_cpu.h
index b3143b07e..e8911fdb7 100644
--- a/osfmk/i386/machine_cpu.h
+++ b/osfmk/i386/machine_cpu.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
- * 
+ *
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 #ifndef _I386_MACHINE_CPU_H_
@@ -35,28 +35,28 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-void	cpu_machine_init(
+void    cpu_machine_init(
 	void);
 
-void	cpu_signal_handler(
-	x86_saved_state_t *regs);
-
-void	handle_pending_TLB_flushes(
+void    handle_pending_TLB_flushes(
 	void);
 
+int cpu_signal_handler(x86_saved_state_t *regs);
 
 kern_return_t cpu_register(
-        int *slot_nump);
+	int *slot_nump);
 __END_DECLS
 
-static inline void cpu_halt(void)
+static inline void
+cpu_halt(void)
 {
-	asm volatile( "wbinvd; cli; hlt" );
+	asm volatile ( "wbinvd; cli; hlt");
 }
 
-static inline void cpu_pause(void)
+static inline void
+cpu_pause(void)
 {
-	asm volatile( "rep; nop" );
+	__builtin_ia32_pause();
 }
 
 #endif /* _I386_MACHINE_CPU_H_ */