![]() | |||||||||||||
Messages in this thread Patch in this message |
For those following the 2.1.81 compile error thread, this patch will fix
all the problems in one fell swoop.
--- v2.1.81/linux/include/asm-i386/softirq.h Fri Jan 23 18:10:32 1998
+++ linux/linux/include/asm-i386/softirq.h Fri Jan 23 20:31:10 1998
@@ -91,8 +91,8 @@
}
/* These are for the irq's testing the lock */
-#define softirq_trylock() (in_bh ? 0 : (local_bh_count[smp_processor_id()]=1))
-#define softirq_endlock() (local_bh_count[smp_processor_id()] = 0)
+#define softirq_trylock(cpu) (in_bh() ? 0 : (local_bh_count[smp_processor_id()]=1))
+#define softirq_endlock(cpu) (local_bh_count[smp_processor_id()] = 0)
#define synchronize_bh() do { } while (0)
#endif /* SMP */
--- v2.1.81/arch/i386/kernel/i386_ksyms.c Fri Jan 23 22:58:21 1998
+++ linux/arch/i386/kernel/i386_ksyms.c Fri Jan 23 23:50:45 1998
@@ -39,7 +39,6 @@
EXPORT_SYMBOL_NOVERS(__down_failed);
EXPORT_SYMBOL_NOVERS(__down_failed_interruptible);
EXPORT_SYMBOL_NOVERS(__up_wakeup);
-EXPORT_SYMBOL(global_bh_lock);
/* Networking helper routines. */
EXPORT_SYMBOL(csum_partial_copy);
/* Delay loops */
@@ -63,6 +62,7 @@
EXPORT_SYMBOL(strlen_user);
#ifdef __SMP__
+EXPORT_SYMBOL(global_bh_lock);
EXPORT_SYMBOL(apic_reg); /* Needed internally for the I386 inlines
*/
EXPORT_SYMBOL(cpu_data);
EXPORT_SYMBOL_NOVERS(kernel_flag);
--- v2.1.81/arch/i386/kernel/irq.c Fri Jan 23 22:58:21 1998
+++ linux/arch/i386/kernel/irq.c Sat Jan 24 00:18:40 1998
@@ -642,6 +642,7 @@
/*
* FIXME! This is completely broken.
*/
+#ifdef __SMP__
static void do_ioapic_IRQ(int irq, int cpu, struct pt_regs * regs)
{
int should_handle_irq;
@@ -679,6 +680,7 @@
enable_IO_APIC_irq(irq);
}
+#endif /* __SMP__ */
/*
* do_IRQ handles all normal device IRQ's (the special
@@ -714,9 +716,10 @@
kstat.irqs[cpu][irq]++;
do_lowlevel_IRQ = do_8259A_IRQ;
+#ifdef __SMP__
if (IO_APIC_IRQ(irq))
do_lowlevel_IRQ = do_ioapic_IRQ;
-
+#endif
do_lowlevel_IRQ(irq, cpu, ®s);
/*
| ||||||||||||
| Last update: 2005-03-22 12:41 [W:0.203 / U:0.060 seconds] ©2003-2008 Jasper Spaans | |||||||||||||