xnu-4903.270.47.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 1694cb38ddc29bdbce6d7bb287895cc50fd5ba26..e8911fdb7741dcd90284fb7ad2518538d8fdd6eb 100644 (file)
--- a/osfmk/i386/machine_cpu.h
+++ b/osfmk/i386/machine_cpu.h
@@ -1,17 +1,20 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
  * 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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
+ * 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,
@@ -19,8 +22,8 @@
  * 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_LICENSE_HEADER_END@
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 #ifndef _I386_MACHINE_CPU_H_
 #define _I386_MACHINE_CPU_H_
@@ -29,28 +32,31 @@
 #include <mach/boolean.h>
 #include <kern/kern_types.h>
 #include <pexpert/pexpert.h>
+#include <sys/cdefs.h>
 
-void   cpu_machine_init(
+__BEGIN_DECLS
+void    cpu_machine_init(
        void);
 
-kern_return_t cpu_register(
-        int *);
-
-kern_return_t cpu_start(
-        int);
+void    handle_pending_TLB_flushes(
+       void);
 
-void   cpu_doshutdown(
-        void);
+int cpu_signal_handler(x86_saved_state_t *regs);
 
-void   cpu_sleep(
-        void);
+kern_return_t cpu_register(
+       int *slot_nump);
+__END_DECLS
 
-struct i386_interrupt_state;
-void   cpu_signal_handler(
-       struct i386_interrupt_state *regs);
+static inline void
+cpu_halt(void)
+{
+       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_ */