xnu-792.6.61.tar.gz

[apple/xnu.git] / osfmk / kern / cpu_data.h

diff --git a/osfmk/kern/cpu_data.h b/osfmk/kern/cpu_data.h
index 9a2ffafc66cd40d2a5c697f170caa3aade0f027f..25ea592543c93d64443237b3c59c5037c207de8b 100644 (file)
--- a/osfmk/kern/cpu_data.h
+++ b/osfmk/kern/cpu_data.h
@@ -1,24 +1,21 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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 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.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * 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@
  */
@@ -26,50 +23,31 @@
  * @OSF_COPYRIGHT@
  */
 
-#ifndef        _CPU_DATA_H_
-#define        _CPU_DATA_H_
-
-#include <sys/appleapiopts.h>
-
-#ifdef __APPLE_API_PRIVATE
+#ifdef XNU_KERNEL_PRIVATE
 
-#ifdef MACH_KERNEL_PRIVATE
+#ifndef        _KERN_CPU_DATA_H_
+#define        _KERN_CPU_DATA_H_
 
-#include <cpus.h>
 #include <mach/mach_types.h>
+#include <sys/cdefs.h>
 
-typedef struct
-{
-       thread_t        active_thread;
-       int             preemption_level;
-       int             simple_lock_count;
-       int             interrupt_level;
-#ifdef __I386__
-       int             cpu_number;             /* Logical CPU number */
-       int             cpu_phys_number;        /* Physical CPU Number */
-#endif
-} cpu_data_t;
+#ifdef MACH_KERNEL_PRIVATE
 
 #include <machine/cpu_data.h>
 
-#else  /* MACH_KERNEL_PRIVATE */
-
-#define disable_preemption()                   _disable_preemption()
-#define enable_preemption()                    _enable_preemption()
-#define enable_preemption_no_check()           _enable_preemption_no_check()
-
 #endif /* MACH_KERNEL_PRIVATE */
 
-#endif /* __APPLE_API_PRIVATE */
+__BEGIN_DECLS
 
-#ifdef __APPLE_API_UNSTABLE
+extern void            _disable_preemption(void);
+extern void            _enable_preemption(void);
 
-#if            !defined(MACH_KERNEL_PRIVATE)
+#define disable_preemption()                   _disable_preemption()
+#define enable_preemption()                    _enable_preemption()
 
-extern thread_t                        current_thread(void);
 
-#endif /* MACH_KERNEL_PRIVATE */
+__END_DECLS
 
-#endif /* __APPLE_API_UNSTABLE */
+#endif /* _KERN_CPU_DATA_H_ */
 
-#endif /* _CPU_DATA_H_ */
+#endif /* XNU_KERNEL_PRIVATE */