scheduler fixes
Linus, please pull the latest scheduler git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched.git
two commits: a lockdep warning improvement and a sched_clock() fix. Thanks,
Ingo
------------------>
Ingo Molnar (2):
lockdep: make cli/sti annotation warnings clearer
sched: enable early use of sched_clock()
lockdep.c | 13 +++++++++---- sched.c | 7 ++++++- 2 files changed, 15 insertions(+), 5 deletions(-)
kernel/lockdep.c +9 -4
@@ -2654,10 +2654,15 @@ static void check_flags(unsigned long flags)if (!debug_locks)return ; -if (irqs_disabled_flags (flags)) -DEBUG_LOCKS_WARN_ON (current->hardirqs_enabled); -else -DEBUG_LOCKS_WARN_ON (!current->hardirqs_enabled); +if (irqs_disabled_flags (flags)) { +if (DEBUG_LOCKS_WARN_ON (current->hardirqs_enabled)) { +printk ("possible reason: unannotated irqs-off.\n" ); + } + }else { +if (DEBUG_LOCKS_WARN_ON (!current->hardirqs_enabled)) { +printk ("possible reason: unannotated irqs-on.\n" ); + } + }/* * We dont accurately track softirq state in e.g.
kernel/sched.c +6 -1
@@ -488,7 +488,12 @@ unsigned long long cpu_clock(int cpu)local_irq_save (flags); rq =cpu_rq (cpu); -update_rq_clock (rq); +/* +* Only call sched_clock() if the scheduler has already been +* initialized (some code might call cpu_clock() very early): +*/ +if (rq->idle) +update_rq_clock (rq); now = rq->clock;local_irq_restore (flags);