From: Alexander Nyberg <alexn@telia.com>
Fix another oops due to incorrect sectioning.
Signed-off-by: Alexander Nyberg <alexn@telia.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/arch/x86_64/kernel/io_apic.c | 6 +-----
1 files changed, 1 insertion(+), 5 deletions(-)
diff -puN arch/x86_64/kernel/io_apic.c~assign_irq_vector-section-fix arch/x86_64/kernel/io_apic.c
--- 25/arch/x86_64/kernel/io_apic.c~assign_irq_vector-section-fix 2004-10-16 01:12:18.900812240 -0700
+++ 25-akpm/arch/x86_64/kernel/io_apic.c 2004-10-16 01:12:20.155621480 -0700
@@ -327,7 +327,7 @@ static int find_irq_entry(int apic, int
/*
* Find the pin to which IRQ[irq] (ISA) is connected
*/
-static int __init find_isa_irq_pin(int irq, int type)
+static int find_isa_irq_pin(int irq, int type)
{
int i;
@@ -654,11 +654,7 @@ static inline int IO_APIC_irq_trigger(in
/* irq_vectors is indexed by the sum of all RTEs in all I/O APICs. */
u8 irq_vector[NR_IRQ_VECTORS] = { FIRST_DEVICE_VECTOR , 0 };
-#ifdef CONFIG_PCI_MSI
int assign_irq_vector(int irq)
-#else
-int __init assign_irq_vector(int irq)
-#endif
{
static int current_vector = FIRST_DEVICE_VECTOR, offset = 0;
_