Changeset 7bdcc45 in mainline for kernel/genarch/src/acpi/madt.c

Timestamp:

2010-12-16T16:38:49Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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 mainline changes.

File:

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

kernel/genarch/src/acpi/madt.c

@@ -165 +165 @@
                 /* Remember index of the first io apic entry */
                 madt_io_apic_entry_index = i;
-                io_apic = (uint32_t *) (unative_t) ioa->io_apic_address;
+                io_apic = (uint32_t *) (sysarg_t) ioa->io_apic_address;
         } else {
                 /* Currently not supported */
@@ -190 +190 @@
         struct madt_apic_header *hdr;
         
-        l_apic = (uint32_t *) (unative_t) acpi_madt->l_apic_address;
+        l_apic = (uint32_t *) (sysarg_t) acpi_madt->l_apic_address;
         
         /* Count MADT entries */