Re: 2.3.16-1 fails on i386 UP

Jeff Garzik (jgarzik@pobox.com)
Tue, 31 Aug 1999 00:15:20 -0400


This is a multi-part message in MIME format.
--------------B10C9A0E3AE578DFBCE89322
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Michael Harnois wrote:
> ... due to i386_bh_lock being undefined.

Here is the patch that got me working.

Regards,

Jeff

-- 
Americans' greatest fear is that America will turn out to have been a
phenomenon, not a civilization.
                -- Shirley Hazzard, "Transit of Venus"
--------------B10C9A0E3AE578DFBCE89322
Content-Type: text/plain; charset=us-ascii;
 name="patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="patch"

Index: include/asm-i386/softirq.h =================================================================== RCS file: /home/cvsgarzik/linux_2_3/include/asm-i386/softirq.h,v retrieving revision 1.1.1.3 diff -u -r1.1.1.3 softirq.h --- softirq.h 1999/08/31 03:08:19 1.1.1.3 +++ softirq.h 1999/08/31 04:14:02 @@ -18,6 +18,8 @@ #define get_active_bhs() (bh_mask & bh_active) #define clear_active_bhs(x) atomic_clear_mask((x),&bh_active) +extern spinlock_t i386_bh_lock; + #ifdef __SMP__ /* @@ -27,7 +29,6 @@ */ extern atomic_t global_bh_lock; extern atomic_t global_bh_count; -extern spinlock_t i386_bh_lock; extern void synchronize_bh(void); Index: arch/i386/kernel/irq.c =================================================================== RCS file: /home/cvsgarzik/linux_2_3/arch/i386/kernel/irq.c,v retrieving revision 1.1.1.6 diff -u -r1.1.1.6 irq.c --- irq.c 1999/08/31 03:15:19 1.1.1.6 +++ irq.c 1999/08/31 04:14:04 @@ -125,10 +125,13 @@ return p - buf; } + /* * Global interrupt locks for SMP. Allow interrupts to come in on any * CPU, yet make cli/sti act globally to protect critical regions.. */ +spinlock_t i386_bh_lock = SPIN_LOCK_UNLOCKED; + #ifdef __SMP__ unsigned char global_irq_holder = NO_PROC_ID; unsigned volatile int global_irq_lock; @@ -136,7 +139,6 @@ atomic_t global_bh_count; atomic_t global_bh_lock; -spinlock_t i386_bh_lock = SPIN_LOCK_UNLOCKED; /* * "global_cli()" is a special case, in that it can hold the

--------------B10C9A0E3AE578DFBCE89322--

- 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/