Skip to content

Commit 3e51f3c

Browse files
fweisbecIngo Molnar
authored andcommitted
sched/preempt: Remove PREEMPT_ACTIVE unmasking off in_atomic()
Now that PREEMPT_ACTIVE implies PREEMPT_DISABLE_OFFSET, ignoring PREEMPT_ACTIVE from in_atomic() check isn't useful anymore. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1431441711-29753-7-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent e017cf2 commit 3e51f3c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/linux/preempt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
* used in the general case to determine whether sleeping is possible.
113113
* Do not use in_atomic() in driver code.
114114
*/
115-
#define in_atomic() ((preempt_count() & ~PREEMPT_ACTIVE) != 0)
115+
#define in_atomic() (preempt_count() != 0)
116116

117117
/*
118118
* Check whether we were atomic before we did preempt_disable():

0 commit comments

Comments
 (0)