From f29a395a136c014eed34f561d96e6bdb575005cc Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sat, 26 Apr 2008 11:30:34 -0700 Subject: [PATCH] --- yaml --- r: 96036 b: refs/heads/master c: d478c2cfaa2476f8b6876f9eb4d8fddcfa986479 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0752a9740820..4045ade8e2ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 733a0771df46af942b8355cd8bb15780106b4353 +refs/heads/master: d478c2cfaa2476f8b6876f9eb4d8fddcfa986479 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 00c1ba706a5a..ed3caf26990d 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -1124,6 +1124,7 @@ void sched_clock_idle_sleep_event(void) { struct rq *rq = cpu_rq(smp_processor_id()); + WARN_ON(!irqs_disabled()); spin_lock(&rq->lock); __update_rq_clock(rq); spin_unlock(&rq->lock); @@ -1139,6 +1140,7 @@ void sched_clock_idle_wakeup_event(u64 delta_ns) struct rq *rq = cpu_rq(smp_processor_id()); u64 now = sched_clock(); + WARN_ON(!irqs_disabled()); rq->idle_clock += delta_ns; /* * Override the previous timestamp and ignore all