xnu-1228.12.14.tar.gz

[apple/xnu.git] / osfmk / kern / host.c

diff --git a/osfmk/kern/host.c b/osfmk/kern/host.c
index 010ac288767fd2b06e2cc3906e8dd859624b0a9d..0f8de2841a9d3138f600d756e8f55a01723a6cfa 100644 (file)
--- a/osfmk/kern/host.c
+++ b/osfmk/kern/host.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -153,7 +153,7 @@ host_info(
        case HOST_BASIC_INFO:
        {
                register host_basic_info_t      basic_info;
-               register int                            master_slot;
+               register int                            master_num;
 
                /*
                 *      Basic information about this host.
@@ -166,12 +166,12 @@ host_info(
                basic_info->memory_size = machine_info.memory_size;
                basic_info->max_cpus = machine_info.max_cpus;
                basic_info->avail_cpus = processor_avail_count;
-               master_slot = PROCESSOR_DATA(master_processor, slot_num);
-               basic_info->cpu_type = slot_type(master_slot);
-               basic_info->cpu_subtype = slot_subtype(master_slot);
+               master_num = master_processor->cpu_num;
+               basic_info->cpu_type = slot_type(master_num);
+               basic_info->cpu_subtype = slot_subtype(master_num);
 
                if (*count >= HOST_BASIC_INFO_COUNT) {
-                       basic_info->cpu_threadtype = slot_threadtype(master_slot);
+                       basic_info->cpu_threadtype = slot_threadtype(master_num);
                        basic_info->physical_cpu = machine_info.physical_cpu;
                        basic_info->physical_cpu_max = machine_info.physical_cpu_max;
                        basic_info->logical_cpu = machine_info.logical_cpu;