| commit | 3e51f3c4004c9b01f66da03214a3e206f5ed627b | [log] [tgz] |
|---|---|---|
| author | Frederic Weisbecker <[email protected]> | Tue May 12 16:41:51 2015 +0200 |
| committer | Ingo Molnar <[email protected]> | Tue May 19 08:39:13 2015 +0200 |
| tree | c0662004b70d9ebbc6d082802f62f6fb68d5d87c | |
| parent | e017cf21ae82e0b36f026b22083a8ae67926f465 [diff] [blame] |
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 <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
diff --git a/include/linux/preempt.h b/include/linux/preempt.h index 4057696..a1a00e1 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h
@@ -112,7 +112,7 @@ * used in the general case to determine whether sleeping is possible. * Do not use in_atomic() in driver code. */ -#define in_atomic() ((preempt_count() & ~PREEMPT_ACTIVE) != 0) +#define in_atomic() (preempt_count() != 0) /* * Check whether we were atomic before we did preempt_disable():