Merge penguin:v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux

Merge penguin:v2.5/linux
into home.transmeta.com:/home/torvalds/v2.5/linux
c1378606 · Linus Torvalds · 528ce3c0 · 2c9a6b3c · c1378606
Commit c1378606 authored Feb 10, 2002 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

include/asm-i386/smplock.h include/asm-i386/smplock.h +1 -0

No files found.
--- a/include/asm-i386/smplock.h
+++ b/include/asm-i386/smplock.h
@@ -15,6 +15,7 @@ extern spinlock_t kernel_flag;
 #else
 #ifdef CONFIG_PREEMPT
 #define kernel_locked()		preempt_get_count()
+#define global_irq_holder	0
 #else
 #define kernel_locked()		1
 #endif