From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Tue, 12 May 2015 14:41:51 +0000 (+0200)
Subject: sched/preempt: Remove PREEMPT_ACTIVE unmasking off in_atomic()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3e51f3c4004c9b01f66da03214a3e206f5ed627b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

diff --git a/include/linux/preempt.h b/include/linux/preempt.h
index 4057696c641c..a1a00e14c14f 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():