Changeset 20a3465 in mainline for kernel/genarch/src/acpi/madt.c


Ignore:
Timestamp:
2011-10-30T19:50:54Z (12 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3ce78580, 48902fa
Parents:
4c3ad56 (diff), 45bf63c (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:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/genarch/src/acpi/madt.c

    r4c3ad56 r20a3465  
    116116static int madt_irq_to_pin(unsigned int irq)
    117117{
    118         ASSERT(irq < sizeof(isa_irq_map) / sizeof(int));
     118        if (irq >= sizeof(isa_irq_map) / sizeof(int))
     119                return (int) irq;
    119120       
    120121        return isa_irq_map[irq];
     
    178179        ASSERT(override->source < sizeof(isa_irq_map) / sizeof(int));
    179180       
    180         printf("MADT: Ignoring %s entry: bus=%" PRIu8 ", source=%" PRIu8
    181             ", global_int=%" PRIu32 ", flags=%#" PRIx16 "\n",
    182             entry[override->header.type], override->bus, override->source,
    183             override->global_int, override->flags);
     181        isa_irq_map[override->source] = override->global_int;
    184182}
    185183
Note: See TracChangeset for help on using the changeset viewer.