X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/378393581903b274cb7a4d18e0d978071a6b592d..0a7de7458d150b5d4dffc935ba399be265ef0a1a:/osfmk/i386/machine_cpu.h

diff --git a/osfmk/i386/machine_cpu.h b/osfmk/i386/machine_cpu.h
index 85950f68d..e8911fdb7 100644
--- a/osfmk/i386/machine_cpu.h
+++ b/osfmk/i386/machine_cpu.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * @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
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * 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,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * 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_
 #define _I386_MACHINE_CPU_H_
@@ -29,25 +35,28 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-void	cpu_machine_init(
+void    cpu_machine_init(
+	void);
+
+void    handle_pending_TLB_flushes(
 	void);
 
-struct i386_interrupt_state;
-void	cpu_signal_handler(
-	struct i386_interrupt_state *regs);
+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( "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_ */