[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1233310639-27916-14-git-send-email-andi@firstfloor.org>
Date: Fri, 30 Jan 2009 11:17:19 +0100
From: Andi Kleen <andi@...stfloor.org>
To: mingo@...e.hu
Cc: linux-kernel@...r.kernel.org, lnxninja@...ux.vnet.ibm.com,
Andi Kleen <ak@...ux.intel.com>
Subject: [PATCH] Remove setup_ioapic_ids x86_quirks hook
From: Andi Kleen <ak@...ux.intel.com>
Was only used by NUMAQ
Signed-off-by: Andi Kleen <ak@...ux.intel.com>
---
arch/x86/include/asm/setup.h | 1 -
arch/x86/kernel/io_apic.c | 3 ---
arch/x86/kernel/numaq_32.c | 7 -------
3 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index e0b651e..0d3fd5d 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -42,7 +42,6 @@ struct x86_quirks {
void (*mpc_oem_pci_bus)(struct mpc_bus *m);
void (*smp_read_mpc_oem)(struct mpc_oemtable *oemtable,
unsigned short oemsize);
- int (*setup_ioapic_ids)(void);
int (*update_genapic)(void);
};
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c
index 9a3e66f..7743890 100644
--- a/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic.c
@@ -2074,9 +2074,6 @@ static void __init setup_ioapic_ids_from_mpc(void)
unsigned char old_id;
unsigned long flags;
- if (x86_quirks->setup_ioapic_ids && x86_quirks->setup_ioapic_ids())
- return;
-
/*
* Don't check I/O APIC IDs for xAPIC systems. They have
* no meaning without the serial APIC bus.
diff --git a/arch/x86/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c
index 6ddacbc..67d994d 100644
--- a/arch/x86/kernel/numaq_32.c
+++ b/arch/x86/kernel/numaq_32.c
@@ -228,12 +228,6 @@ static void __init smp_read_mpc_oem(struct mpc_oemtable *oemtable,
}
}
-static int __init numaq_setup_ioapic_ids(void)
-{
- /* so can skip it */
- return 1;
-}
-
static int __init numaq_update_genapic(void)
{
return 0;
@@ -253,7 +247,6 @@ static struct x86_quirks numaq_x86_quirks __initdata = {
.mpc_oem_bus_info = mpc_oem_bus_info,
.mpc_oem_pci_bus = mpc_oem_pci_bus,
.smp_read_mpc_oem = smp_read_mpc_oem,
- .setup_ioapic_ids = numaq_setup_ioapic_ids,
.update_genapic = numaq_update_genapic,
};
--
1.5.6.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists