xnu-792.10.96.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..81feb8edab2db5b4a86ae42609a48e8e47faf5c6 100644 (file)
--- a/osfmk/i386/cpu_number.h
+++ b/osfmk/i386/cpu_number.h
@@ -3,22 +3,19 @@
  *
  * @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@
  */
@@ -58,20 +55,23 @@
  *     Machine-dependent definitions for cpu identification.
  *
  */
+#ifdef KERNEL_PRIVATE
+
 #ifndef        _I386_CPU_NUMBER_H_
 #define        _I386_CPU_NUMBER_H_
 
-#if    MP_V1_1
+#ifdef I386_CPU_DATA
 
 /* Get the cpu number directly from the pre-processor data area */
-#include <i386/cpu_data.h>
 #define        cpu_number()    get_cpu_number()
 
-#else  /* MP_V1_1 */
+#else  /* I386_CPU_DATA */
 
 /* Use a function to do this less directly. */
 extern int     cpu_number(void);
 
-#endif /* MP_V1_1 */
+#endif /* I386_CPU_DATA */
 
 #endif /* _I386_CPU_NUMBER_H_ */
+
+#endif /* KERNEL_PRIVATE */