---

yaml --- r: 96036 b: refs/heads/master c: d478c2c h: refs/heads/master v: v3
git-mirror · May 5, 2008 · f29a395 · f29a395
1 parent 724592b
commit f29a395
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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