In time.c the i8259A_lock is defined extern inside a
#ifndef CONFIG_X86_TSC block.
Since CONFIG_X86_TSC is enabled in my config, this breakes the compile.
Then again IMHO an extern declaration should go to a header, and
include/asm-i386/irq.h seems to be appropriated. Thus i suggest the
attached patch.
Have a nice weekend and please CC me in replys
Gert
PS: Sorry if this was already mentioned, but I read the list in the hypertext
archive so i'm a bit late
diff -ruN linux-ac19/arch/i386/kernel/io_apic.c linux-wollny/arch/i386/kernel/io_apic.c
--- linux-ac19/arch/i386/kernel/io_apic.c Fri Jun 16 16:27:05 2000
+++ linux-wollny/arch/i386/kernel/io_apic.c Sat Jun 17 13:39:00 2000
@@ -30,6 +30,7 @@
#include <asm/io.h>
#include <asm/smp.h>
#include <asm/desc.h>
+#include <asm/irq.h>
static spinlock_t ioapic_lock = SPIN_LOCK_UNLOCKED;
@@ -903,7 +904,6 @@
void /*__init*/ print_PIC(void)
{
- extern spinlock_t i8259A_lock;
unsigned int v, flags;
printk(KERN_DEBUG "\nprinting PIC contents\n");
diff -ruN linux-ac19/arch/i386/kernel/time.c linux-wollny/arch/i386/kernel/time.c
--- linux-ac19/arch/i386/kernel/time.c Fri Jun 16 16:27:05 2000
+++ linux-wollny/arch/i386/kernel/time.c Sat Jun 17 12:26:03 2000
@@ -59,7 +59,7 @@
#include <asm/cobalt.h>
/*
- * for x86_do_profile()
+ * for x86_do_profile() and i8259A_lock
*/
#include <linux/irq.h>
@@ -118,7 +118,6 @@
#ifndef CONFIG_X86_TSC
-extern spinlock_t i8259A_lock;
/* This function must be called with interrupts disabled
* It was inspired by Steve McCanne's microtime-i386 for BSD. -- jrs
diff -ruN linux-ac19/include/asm-i386/irq.h linux-wollny/include/asm-i386/irq.h
--- linux-ac19/include/asm-i386/irq.h Thu Oct 7 19:17:09 1999
+++ linux-wollny/include/asm-i386/irq.h Sat Jun 17 12:28:26 2000
@@ -31,5 +32,8 @@
extern void disable_irq(unsigned int);
extern void disable_irq_nosync(unsigned int);
extern void enable_irq(unsigned int);
+
+
+extern spinlock_t i8259A_lock;
#endif /* _ASM_IRQ_H */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Fri Jun 23 2000 - 21:00:14 EST