lkml.org 
[lkml]   [2011]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 9/9] x86, ioapic: consolidate mp_ioapic_routing[] into struct ioapic
    Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
    ---
    arch/x86/kernel/apic/io_apic.c | 9 +++------
    1 file changed, 3 insertions(+), 6 deletions(-)

    Index: linux-2.6-tip/arch/x86/kernel/apic/io_apic.c
    ===================================================================
    --- linux-2.6-tip.orig/arch/x86/kernel/apic/io_apic.c
    +++ linux-2.6-tip/arch/x86/kernel/apic/io_apic.c
    @@ -89,6 +89,7 @@ static struct ioapic {
    struct mpc_ioapic mp_config;
    /* IO APIC gsi routing info */
    struct mp_ioapic_gsi gsi_config;
    + DECLARE_BITMAP(pin_programmed, MP_MAX_IOAPIC_PIN + 1);
    } ioapics[MAX_IO_APICS];

    #define mpc_ioapic_ver(id) ioapics[id].mp_config.apicver
    @@ -1356,10 +1357,6 @@ static void setup_ioapic_irq(int apic_id
    ioapic_write_entry(apic_id, pin, entry);
    }

    -static struct {
    - DECLARE_BITMAP(pin_programmed, MP_MAX_IOAPIC_PIN + 1);
    -} mp_ioapic_routing[MAX_IO_APICS];
    -
    static bool __init io_apic_pin_not_connected(int idx, int apic_id, int pin)
    {
    if (idx != -1)
    @@ -3540,14 +3537,14 @@ int io_apic_setup_irq_pin_once(unsigned
    int ret;

    /* Avoid redundant programming */
    - if (test_bit(pin, mp_ioapic_routing[id].pin_programmed)) {
    + if (test_bit(pin, ioapics[id].pin_programmed)) {
    pr_debug("Pin %d-%d already programmed\n",
    mpc_ioapic_id(id), pin);
    return 0;
    }
    ret = io_apic_setup_irq_pin(irq, node, attr);
    if (!ret)
    - set_bit(pin, mp_ioapic_routing[id].pin_programmed);
    + set_bit(pin, ioapics[id].pin_programmed);
    return ret;
    }




    \
     
     \ /
      Last update: 2011-05-19 01:35    [W:0.026 / U:31.744 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site