Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-02-10 01:33:31 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2002-02-10 01:33:31 -0800
commitc1378606c5680a47f59db1b8050d90078d50c3a4 (patch)
tree3937a2374607b2d902746c82ebb28cfc3dda2803
parent528ce3c01427a95744fca2147f5a8ccd66de483b (diff)
parent2c9a6b3cac3ddfd47d4cdaea73a94958950fc613 (diff)
Merge penguin:v2.5/linux
into home.transmeta.com:/home/torvalds/v2.5/linux
-rw-r--r--include/asm-i386/smplock.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-i386/smplock.h b/include/asm-i386/smplock.h
index 199084cce08f..e1d592575a19 100644
--- 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