lkml.org 
[lkml]   [2011]   [May]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/apic] x86, ioapic: Consolidate mp_ioapic_routing[] into 'struct ioapic'
    Commit-ID:  8f18c9711ed31c257d4f00a094b2fdbe72a741da
    Gitweb: http://git.kernel.org/tip/8f18c9711ed31c257d4f00a094b2fdbe72a741da
    Author: Suresh Siddha <suresh.b.siddha@intel.com>
    AuthorDate: Wed, 18 May 2011 16:31:39 -0700
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Fri, 20 May 2011 13:41:02 +0200

    x86, ioapic: Consolidate mp_ioapic_routing[] into 'struct ioapic'

    Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
    Cc: daniel.blueman@gmail.com
    Link: http://lkml.kernel.org/r/20110518233158.089978277@sbsiddha-MOBL3.sc.intel.com
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    ---
    arch/x86/kernel/apic/io_apic.c | 9 +++------
    1 files changed, 3 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
    index b7dd233..9488dcf 100644
    --- a/arch/x86/kernel/apic/io_apic.c
    +++ b/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, int pin, unsigned int irq,
    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 irq, int node,
    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-20 15:43    [W:0.049 / U:59.348 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site