Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMel Gorman <mgorman@suse.de>2017-11-15 14:39:17 +0000
committerMel Gorman <mgorman@suse.de>2017-11-15 14:39:21 +0000
commit3a46b4337b931b9a6ac0b7c32df3341ad75acd9f (patch)
treee030909d4cfc8d4167a806f3b7fbf3df7034c630
parent62f354b2fe3672bad80ef1a0c654c64b803ada50 (diff)
sched/clock, sched/cputime: Use lockdep to assert IRQs are
disabled/enabled (bnc#1068202 Avoid irqs_disabled debugging checks in fast paths). suse-commit: c6be10f63dff3b47d959ad60751b77d06e7bc4b3
-rw-r--r--kernel/sched/clock.c2
-rw-r--r--kernel/sched/cputime.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/kernel/sched/clock.c b/kernel/sched/clock.c
index ca0f8fc945c6..e086babe6c61 100644
--- a/kernel/sched/clock.c
+++ b/kernel/sched/clock.c
@@ -388,7 +388,7 @@ void sched_clock_tick(void)
if (unlikely(!sched_clock_running))
return;
- WARN_ON_ONCE(!irqs_disabled());
+ lockdep_assert_irqs_disabled();
scd = this_scd();
__scd_stamp(scd);
diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c
index ad275b25e3f9..57507c85bd2c 100644
--- a/kernel/sched/cputime.c
+++ b/kernel/sched/cputime.c
@@ -259,8 +259,7 @@ static inline u64 account_other_time(u64 max)
{
u64 accounted;
- /* Shall be converted to a lockdep-enabled lightweight check */
- WARN_ON_ONCE(!irqs_disabled());
+ lockdep_assert_irqs_disabled();
accounted = steal_account_process_time(max);