xnu-1456.1.26.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 eeda73ff319425f689669e04fb162f1deafbc68d..b0348fce61f961a477afa68b5e3301ab53725b65 100644 (file)
--- a/osfmk/i386/cpu_number.h
+++ b/osfmk/i386/cpu_number.h
@@ -61,23 +61,23 @@
  *     Machine-dependent definitions for cpu identification.
  *
  */
-#ifdef KERNEL_PRIVATE
-
 #ifndef        _I386_CPU_NUMBER_H_
 #define        _I386_CPU_NUMBER_H_
 
-#ifdef I386_CPU_DATA
+#ifdef KERNEL_PRIVATE
+
+/* Use a function to do this less directly. */
+extern int     cpu_number(void);
+
+#ifdef MACH_KERNEL_PRIVATE
+#include <i386/cpu_data.h>
 
 /* Get the cpu number directly from the pre-processor data area */
 #define        cpu_number()    get_cpu_number()
 
-#else  /* I386_CPU_DATA */
-
-/* Use a function to do this less directly. */
-extern int     cpu_number(void);
+#endif /* !MACH_KERNEL_PRIVATE */
 
-#endif /* I386_CPU_DATA */
+#endif /* KERNEL_PRIVATE */
 
 #endif /* _I386_CPU_NUMBER_H_ */
 
-#endif /* KERNEL_PRIVATE */