Commit fa2dd441 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched 

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
  sched: enable early use of sched_clock()
  lockdep: make cli/sti annotation warnings clearer
parents e17587b5 8ced5f69

kernel/lockdep.c

+9 −4
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -488,6 +488,11 @@ unsigned long long cpu_clock(int cpu) 


	local_irq_save(flags);

	rq = cpu_rq(cpu);

	/*

	 * 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);