From: Zwane Mwaikambo <zwane@arm.linux.org.uk>
CC arch/i386/kernel/io_apic.o
arch/i386/kernel/io_apic.c: In function `set_ioapic_affinity_irq':
arch/i386/kernel/io_apic.c:251: warning: implicit declaration of function `set_irq_info'
Signed-off-by: Zwane Mwaikambo <zwane@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
arch/i386/kernel/io_apic.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff -puN arch/i386/kernel/io_apic.c~x86-x86_64-deferred-handling-of-writes-to-proc-irq-xx-smp_affinitypatch-added-to-mm-tree-fix arch/i386/kernel/io_apic.c
--- 25/arch/i386/kernel/io_apic.c~x86-x86_64-deferred-handling-of-writes-to-proc-irq-xx-smp_affinitypatch-added-to-mm-tree-fix 2005-05-25 00:52:47.000000000 -0700
+++ 25-akpm/arch/i386/kernel/io_apic.c 2005-05-25 00:52:47.000000000 -0700
@@ -223,6 +223,7 @@ static void clear_IO_APIC (void)
clear_IO_APIC_pin(apic, pin);
}
+#ifdef CONFIG_SMP
static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask)
{
unsigned long flags;
@@ -254,8 +255,6 @@ static void set_ioapic_affinity_irq(unsi
spin_unlock_irqrestore(&ioapic_lock, flags);
}
-#ifdef CONFIG_SMP
-
#if defined(CONFIG_IRQBALANCE)
# include <asm/processor.h> /* kernel_thread() */
# include <linux/kernel_stat.h> /* kstat */
@@ -819,6 +818,7 @@ EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector
* we need to reprogram the ioredtbls to cater for the cpus which have come online
* so mask in all cases should simply be TARGET_CPUS
*/
+#ifdef CONFIG_SMP
void __init setup_ioapic_dest(void)
{
int pin, ioapic, irq, irq_entry;
@@ -837,6 +837,7 @@ void __init setup_ioapic_dest(void)
}
}
+#endif
/*
* EISA Edge/Level control register, ELCR
@@ -1947,6 +1948,7 @@ static void unmask_IO_APIC_vector (unsig
unmask_IO_APIC_irq(irq);
}
+#ifdef CONFIG_SMP
static void set_ioapic_affinity_vector (unsigned int vector,
cpumask_t cpu_mask)
{
@@ -1956,6 +1958,7 @@ static void set_ioapic_affinity_vector (
set_ioapic_affinity_irq(irq, cpu_mask);
}
#endif
+#endif
/*
* Level and edge triggered IO-APIC interrupts need different handling,
@@ -1973,7 +1976,9 @@ static struct hw_interrupt_type ioapic_e
.disable = disable_edge_ioapic,
.ack = ack_edge_ioapic,
.end = end_edge_ioapic,
+#ifdef CONFIG_SMP
.set_affinity = set_ioapic_affinity,
+#endif
};
static struct hw_interrupt_type ioapic_level_type = {
@@ -1984,7 +1989,9 @@ static struct hw_interrupt_type ioapic_l
.disable = disable_level_ioapic,
.ack = mask_and_ack_level_ioapic,
.end = end_level_ioapic,
+#ifdef CONFIG_SMP
.set_affinity = set_ioapic_affinity,
+#endif
};
static inline void init_IO_APIC_traps(void)
_