Changeset 74b2f5bf in mainline

Timestamp:

2005-09-21T21:07:27Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cf27a6cb

Parents:

aed4eca

Message:

During MADT parse, count only enabled CPUs.

File:

• arch/ia32/src/acpi/madt.c (modified) (3 diffs)

arch/ia32/src/acpi/madt.c

@@ -52 +52 @@
 struct madt_io_apic *madt_io_apic_entries = NULL;
 
-__u32 madt_l_apic_entry_index = 0;
-__u32 madt_io_apic_entry_index = 0;
-int madt_l_apic_entry_cnt = 0;
-int madt_io_apic_entry_cnt = 0;
+index_t madt_l_apic_entry_index = 0;
+index_t madt_io_apic_entry_index = 0;
+count_t madt_l_apic_entry_cnt = 0;
+count_t madt_io_apic_entry_cnt = 0;
+count_t cpu_count = 0;
 
 struct madt_apic_header * * madt_entries_index = NULL;
@@ -177 +178 @@
         
 
-        if (madt_l_apic_entry_cnt)
-                config.cpu_count = madt_l_apic_entry_cnt;
+        if (cpu_count)
+                config.cpu_count = cpu_count;
 }
  
@@ -192 +193 @@
                 return;
         }
-                
+        
+        cpu_count++;    
         apic_id_mask |= 1<<la->apic_id;
 }