lkml.org 
[lkml]   [2009]   [Apr]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/apic] x86: x2apic, IR: Move eoi_ioapic_irq() into a CONFIG_INTR_REMAP section
    Commit-ID:  25629d810a52176758401184d9b437fbb7f79195
    Gitweb: http://git.kernel.org/tip/25629d810a52176758401184d9b437fbb7f79195
    Author: Suresh Siddha <suresh.b.siddha@intel.com>
    AuthorDate: Mon, 20 Apr 2009 13:02:28 -0700
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Tue, 21 Apr 2009 09:08:26 +0200

    x86: x2apic, IR: Move eoi_ioapic_irq() into a CONFIG_INTR_REMAP section

    Address the following complier warning:

    arch/x86/kernel/apic/io_apic.c:2543: warning: `eoi_ioapic_irq' defined but not used

    By moving that function (and eoi_ioapic_irq()) into an existing
    #ifdef CONFIG_INTR_REMAP section of the code.

    [ Impact: cleanup ]

    Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
    Cc: dwmw2@infradead.org
    Cc: Weidong Han <weidong.han@intel.com>
    LKML-Reference: <20090420200450.271099000@linux-os.sc.intel.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Cc: Weidong Han <weidong.han@intel.com>


    ---
    arch/x86/kernel/apic/io_apic.c | 66 ++++++++++++++++++++--------------------
    1 files changed, 33 insertions(+), 33 deletions(-)

    diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
    index 3a45d2e..4baa9cb 100644
    --- a/arch/x86/kernel/apic/io_apic.c
    +++ b/arch/x86/kernel/apic/io_apic.c
    @@ -2517,39 +2517,6 @@ static void irq_complete_move(struct irq_desc **descp)
    static inline void irq_complete_move(struct irq_desc **descp) {}
    #endif

    -static void __eoi_ioapic_irq(unsigned int irq, struct irq_cfg *cfg)
    -{
    - int apic, pin;
    - struct irq_pin_list *entry;
    -
    - entry = cfg->irq_2_pin;
    - for (;;) {
    -
    - if (!entry)
    - break;
    -
    - apic = entry->apic;
    - pin = entry->pin;
    - io_apic_eoi(apic, pin);
    - entry = entry->next;
    - }
    -}
    -
    -static void
    -eoi_ioapic_irq(struct irq_desc *desc)
    -{
    - struct irq_cfg *cfg;
    - unsigned long flags;
    - unsigned int irq;
    -
    - irq = desc->irq;
    - cfg = desc->chip_data;
    -
    - spin_lock_irqsave(&ioapic_lock, flags);
    - __eoi_ioapic_irq(irq, cfg);
    - spin_unlock_irqrestore(&ioapic_lock, flags);
    -}
    -
    static void ack_apic_edge(unsigned int irq)
    {
    struct irq_desc *desc = irq_to_desc(irq);
    @@ -2659,6 +2626,39 @@ static void ack_apic_level(unsigned int irq)
    }

    #ifdef CONFIG_INTR_REMAP
    +static void __eoi_ioapic_irq(unsigned int irq, struct irq_cfg *cfg)
    +{
    + int apic, pin;
    + struct irq_pin_list *entry;
    +
    + entry = cfg->irq_2_pin;
    + for (;;) {
    +
    + if (!entry)
    + break;
    +
    + apic = entry->apic;
    + pin = entry->pin;
    + io_apic_eoi(apic, pin);
    + entry = entry->next;
    + }
    +}
    +
    +static void
    +eoi_ioapic_irq(struct irq_desc *desc)
    +{
    + struct irq_cfg *cfg;
    + unsigned long flags;
    + unsigned int irq;
    +
    + irq = desc->irq;
    + cfg = desc->chip_data;
    +
    + spin_lock_irqsave(&ioapic_lock, flags);
    + __eoi_ioapic_irq(irq, cfg);
    + spin_unlock_irqrestore(&ioapic_lock, flags);
    +}
    +
    static void ir_ack_apic_edge(unsigned int irq)
    {
    ack_APIC_irq();

    \
     
     \ /
      Last update: 2009-04-21 10:11    [W:0.028 / U:29.980 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site