xnu-4570.71.2.tar.gz

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

diff --git a/osfmk/i386/cpu_number.h b/osfmk/i386/cpu_number.h
index 97b7c0d3d4cb229789e2c558ad80a9f0911d4804..b0348fce61f961a477afa68b5e3301ab53725b65 100644 (file)
--- a/osfmk/i386/cpu_number.h
+++ b/osfmk/i386/cpu_number.h
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 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
- * 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
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -61,17 +64,20 @@
 #ifndef        _I386_CPU_NUMBER_H_
 #define        _I386_CPU_NUMBER_H_
 
-#if    MP_V1_1
+#ifdef KERNEL_PRIVATE
 
-/* Get the cpu number directly from the pre-processor data area */
+/* Use a function to do this less directly. */
+extern int     cpu_number(void);
+
+#ifdef MACH_KERNEL_PRIVATE
 #include <i386/cpu_data.h>
-#define        cpu_number()    get_cpu_number()
 
-#else  /* MP_V1_1 */
+/* Get the cpu number directly from the pre-processor data area */
+#define        cpu_number()    get_cpu_number()
 
-/* Use a function to do this less directly. */
-extern int     cpu_number(void);
+#endif /* !MACH_KERNEL_PRIVATE */
 
-#endif /* MP_V1_1 */
+#endif /* KERNEL_PRIVATE */
 
 #endif /* _I386_CPU_NUMBER_H_ */
+