Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ba68940 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull scheduler changes for v3.4 from Ingo Molnar

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (27 commits)
  printk: Make it compile with !CONFIG_PRINTK
  sched/x86: Fix overflow in cyc2ns_offset
  sched: Fix nohz load accounting -- again!
  sched: Update yield() docs
  printk/sched: Introduce special printk_sched() for those awkward moments
  sched/nohz: Correctly initialize 'next_balance' in 'nohz' idle balancer
  sched: Cleanup cpu_active madness
  sched: Fix load-balance wreckage
  sched: Clean up parameter passing of proc_sched_autogroup_set_nice()
  sched: Ditch per cgroup task lists for load-balancing
  sched: Rename load-balancing fields
  sched: Move load-balancing arguments into helper struct
  sched/rt: Do not submit new work when PI-blocked
  sched/rt: Prevent idle task boosting
  sched/wait: Add __wake_up_all_locked() API
  sched/rt: Document scheduler related skip-resched-check sites
  sched/rt: Use schedule_preempt_disabled()
  sched/rt: Add schedule_preempt_disabled()
  sched/rt: Do not throttle when PI boosting
  sched/rt: Keep period timer ticking when rt throttling is active
  ...
parents 9c2b957d 600e1458

Documentation/scheduler/sched-stats.txt

+2 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,8 @@ First field is a sched_yield() statistic: 
     1) # of times sched_yield() was called

     1) # of times sched_yield() was called





Next three are schedule() statistics:

Next three are schedule() statistics:

     2) # of times we switched to the expired queue and reused it

     2) This field is a legacy array expiration count field used in the O(1)

	scheduler. We kept it for ABI compatibility, but it is always set to zero.

     3) # of times schedule() was called

     3) # of times schedule() was called

     4) # of times schedule() left the processor idle

     4) # of times schedule() left the processor idle

arch/arm/kernel/process.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -239,9 +239,7 @@ void cpu_idle(void) 
		leds_event(led_idle_end);

		leds_event(led_idle_end);

		rcu_idle_exit();

		rcu_idle_exit();

		tick_nohz_idle_exit();

		tick_nohz_idle_exit();

		preempt_enable_no_resched();

		schedule_preempt_disabled();

		schedule();

		preempt_disable();

	}

	}

}

}

arch/arm/kernel/smp.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -295,13 +295,6 @@ asmlinkage void __cpuinit secondary_start_kernel(void) 
	 */

	 */

	percpu_timer_setup();

	percpu_timer_setup();





	while (!cpu_active(cpu))

		cpu_relax();



	/*

	 * cpu_active bit is set, so it's safe to enalbe interrupts

	 * now.

	 */

	local_irq_enable();

	local_irq_enable();

	local_fiq_enable();

	local_fiq_enable();

arch/avr32/kernel/process.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -40,9 +40,7 @@ void cpu_idle(void) 
			cpu_idle_sleep();

			cpu_idle_sleep();

		rcu_idle_exit();

		rcu_idle_exit();

		tick_nohz_idle_exit();

		tick_nohz_idle_exit();

		preempt_enable_no_resched();

		schedule_preempt_disabled();

		schedule();

		preempt_disable();

	}

	}

}

}

arch/blackfin/kernel/process.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -94,9 +94,7 @@ void cpu_idle(void) 
			idle();

			idle();

		rcu_idle_exit();

		rcu_idle_exit();

		tick_nohz_idle_exit();

		tick_nohz_idle_exit();

		preempt_enable_no_resched();

		schedule_preempt_disabled();

		schedule();

		preempt_disable();

	}

	}

}

}