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

Commit 0be5255c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull scheduler fixes from Thomas Gleixner:
 "Two small fixes for the schedulre core:

   - Use the proper switch_mm() variant in idle_task_exit() because that
     code is not called with interrupts disabled.

   - Fix a confusing typo in a printk"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/core: Idle_task_exit() shouldn't use switch_mm_irqs_off()
  sched/fair: Fix typo in printk message
parents a1ff31d7 252d2a41

kernel/sched/core.c

+1 −1
Original line number Diff line number Diff line
@@ -5605,7 +5605,7 @@ void idle_task_exit(void) 
	BUG_ON(cpu_online(smp_processor_id()));



	if (mm != &init_mm) {

		switch_mm_irqs_off(mm, &init_mm, current);

		switch_mm(mm, &init_mm, current);

		finish_arch_post_lock_switch();

	}

	mmdrop(mm);

kernel/sched/fair.c

+1 −1
Original line number Diff line number Diff line
@@ -3563,7 +3563,7 @@ static inline void check_schedstat_required(void) 
			trace_sched_stat_runtime_enabled())  {

		printk_deferred_once("Scheduler tracepoints stat_sleep, stat_iowait, "

			     "stat_blocked and stat_runtime require the "

			     "kernel parameter schedstats=enabled or "

			     "kernel parameter schedstats=enable or "

			     "kernel.sched_schedstats=1\n");

	}

#endif