xnu-2782.10.72.tar.gz

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

diff --git a/osfmk/i386/cpu_threads.h b/osfmk/i386/cpu_threads.h
index dca8b4016b7d0de4ede118c16eeab5d7dfad649f..31fe8177934e127571729ecdde1f58dfd0180b9d 100644 (file)
--- a/osfmk/i386/cpu_threads.h
+++ b/osfmk/i386/cpu_threads.h
@@ -29,8 +29,8 @@
 #define _I386_CPU_THREADS_H_
 
 #include <i386/cpu_data.h>
 #define _I386_CPU_THREADS_H_
 
 #include <i386/cpu_data.h>

-#include <i386/mp.h>

 #include <i386/cpu_topology.h>
 #include <i386/cpu_topology.h>

+#include <i386/mp.h>

 
 /*
  * These are defined here rather than in cpu_topology.h so as to keep
 
 /*
  * These are defined here rather than in cpu_topology.h so as to keep


@@ -68,11 +68,16 @@ extern void *cpu_thread_alloc(int);
 extern void cpu_thread_init(void);
 extern void cpu_thread_halt(void);
 
 extern void cpu_thread_init(void);
 extern void cpu_thread_halt(void);
 

-extern void x86_set_lcpu_numbers(x86_lcpu_t *lcpu);
-extern void x86_set_core_numbers(x86_core_t *core, x86_lcpu_t *lcpu);
-extern void x86_set_die_numbers(x86_die_t *die, x86_lcpu_t *lcpu);
-extern void x86_set_pkg_numbers(x86_pkg_t *pkg, x86_lcpu_t *lcpu);
+extern void x86_set_logical_topology(x86_lcpu_t *lcpu, int pnum, int lnum);
+extern void x86_validate_topology(void);

 
 extern x86_topology_parameters_t       topoParms;
 
 
 extern x86_topology_parameters_t       topoParms;
 

+extern boolean_t       topo_dbg;
+#define TOPO_DBG(x...)                 \
+       do {                            \
+               if (topo_dbg)           \
+                       kprintf(x);     \
+       } while (0)                     \
+

 #endif /* _I386_CPU_THREADS_H_ */
 #endif /* _I386_CPU_THREADS_H_ */