Changeset 50f4b95 in mainline for kernel/genarch/src/acpi/madt.c

Timestamp:

2010-06-30T20:36:48Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

99718a2e

Parents:

0a79ad9 (diff), e9f4b59 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge (hopefully) final fix for ia32/amd64 SMP issues.

File:

• kernel/genarch/src/acpi/madt.c (modified) (2 diffs)

kernel/genarch/src/acpi/madt.c

@@ -131 +131 @@
 };
 
-static int madt_cmp(void *a, void *b)
-{
-        uint8_t typea = ((struct madt_apic_header *) a)->type;
-        uint8_t typeb = ((struct madt_apic_header *) b)->type;
+static int madt_cmp(void *a, void *b, void *arg)
+{
+        uint8_t typea = (*((struct madt_apic_header **) a))->type;
+        uint8_t typeb = (*((struct madt_apic_header **) b))->type;
         
         if (typea > typeb)
@@ -208 +208 @@
         
         /* Sort MADT index structure */
-        qsort(madt_entries_index, madt_entries_index_cnt, sizeof(uintptr_t),
-            &madt_cmp);
+        if (!gsort(madt_entries_index, madt_entries_index_cnt,
+            sizeof(struct madt_apic_header *), madt_cmp, NULL))
+                panic("Sorting error.");
         
         /* Parse MADT entries */