Skip to content

L
linux
Commit c1378606 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge penguin:v2.5/linux 

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 528ce3c0 2c9a6b3c
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
include/asm-i386/smplock.h
View file @ c1378606
...@@ -15,6 +15,7 @@ extern spinlock_t kernel_flag; ...@@ -15,6 +15,7 @@ extern spinlock_t kernel_flag;
#else #else
#ifdef CONFIG_PREEMPT #ifdef CONFIG_PREEMPT
#define kernel_locked() preempt_get_count() #define kernel_locked() preempt_get_count()
#define global_irq_holder 0
#else #else
#define kernel_locked() 1 #define kernel_locked() 1
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7