Make "in_atomic()" work right with preempt enabled

a28cb962 · Linus Torvalds · Linus Torvalds · 49cda8eb · a28cb962
Commit a28cb962 authored Sep 16, 2002 by Linus Torvalds Committed by Linus Torvalds Sep 16, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

include/asm-i386/hardirq.h include/asm-i386/hardirq.h +1 -1

No files found.
--- a/include/asm-i386/hardirq.h
+++ b/include/asm-i386/hardirq.h
@@ -77,7 +77,7 @@ typedef struct {
 #define irq_enter()		(preempt_count() += HARDIRQ_OFFSET)

 #if CONFIG_PREEMPT
-# define in_atomic()	(preempt_count() != kernel_locked())
+# define in_atomic()	((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked())
 # define IRQ_EXIT_OFFSET (HARDIRQ_OFFSET-1)
 #else
 # define in_atomic()	(preempt_count() != 0)