lkml.org 
[lkml]   [2010]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/15] x86 ioapic: Fix the types of gsi values
    Date
    From: Eric W. Biederman <ebiederm@xmission.com>

    This patches fixes the types of gsi_base and gsi_end values in
    struct mp_ioapic_gsi, and the gsi parameter of mp_find_ioapic
    and mp_find_ioapic_pin

    A gsi is cannonically a u32, not an int.

    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    ---
    arch/x86/include/asm/io_apic.h | 10 +++++-----
    arch/x86/kernel/apic/io_apic.c | 4 ++--
    2 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
    index 35832a0..feeaf0d 100644
    --- a/arch/x86/include/asm/io_apic.h
    +++ b/arch/x86/include/asm/io_apic.h
    @@ -180,12 +180,12 @@ extern void ioapic_write_entry(int apic, int pin,
    extern void setup_ioapic_ids_from_mpc(void);

    struct mp_ioapic_gsi{
    - int gsi_base;
    - int gsi_end;
    + u32 gsi_base;
    + u32 gsi_end;
    };
    extern struct mp_ioapic_gsi mp_gsi_routing[];
    -int mp_find_ioapic(int gsi);
    -int mp_find_ioapic_pin(int ioapic, int gsi);
    +int mp_find_ioapic(u32 gsi);
    +int mp_find_ioapic_pin(int ioapic, u32 gsi);
    void __init mp_register_ioapic(int id, u32 address, u32 gsi_base);
    extern void __init pre_init_apic_IRQ0(void);

    @@ -197,7 +197,7 @@ static const int timer_through_8259 = 0;
    static inline void ioapic_init_mappings(void) { }
    static inline void ioapic_insert_resources(void) { }
    static inline void probe_nr_irqs_gsi(void) { }
    -static inline int mp_find_ioapic(int gsi) { return 0; }
    +static inline int mp_find_ioapic(u32 gsi) { return 0; }

    struct io_apic_irq_attr;
    static inline int io_apic_set_pci_routing(struct device *dev, int irq,
    diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
    index 7e139bb..4611c43 100644
    --- a/arch/x86/kernel/apic/io_apic.c
    +++ b/arch/x86/kernel/apic/io_apic.c
    @@ -4238,7 +4238,7 @@ void __init ioapic_insert_resources(void)
    }
    }

    -int mp_find_ioapic(int gsi)
    +int mp_find_ioapic(u32 gsi)
    {
    int i = 0;

    @@ -4253,7 +4253,7 @@ int mp_find_ioapic(int gsi)
    return -1;
    }

    -int mp_find_ioapic_pin(int ioapic, int gsi)
    +int mp_find_ioapic_pin(int ioapic, u32 gsi)
    {
    if (WARN_ON(ioapic == -1))
    return -1;
    --
    1.6.5.2.143.g8cc62


    \
     
     \ /
      Last update: 2010-03-30 10:13    [W:0.036 / U:184.208 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site