mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 01:49:36 +00:00
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>
This commit is contained in:
parent
c040aaeb86
commit
8f18c9711e
1 changed files with 3 additions and 6 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue