leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds 2017-06-18 18:45:17 +09:00
commit 0be5255c88
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/sched/core.c
View File

@ -5605,7 +5605,7 @@ void idle_task_exit(void)
BUG_ON(cpu_online(smp_processor_id())); BUG_ON(cpu_online(smp_processor_id()));
if (mm != &init_mm) { if (mm != &init_mm) {
switch_mm_irqs_off(mm, &init_mm, current); switch_mm(mm, &init_mm, current);
finish_arch_post_lock_switch(); finish_arch_post_lock_switch();
} }
mmdrop(mm); mmdrop(mm);

2
kernel/sched/fair.c
View File

@ -3563,7 +3563,7 @@ static inline void check_schedstat_required(void)
trace_sched_stat_runtime_enabled()) { trace_sched_stat_runtime_enabled()) {
printk_deferred_once("Scheduler tracepoints stat_sleep, stat_iowait, " printk_deferred_once("Scheduler tracepoints stat_sleep, stat_iowait, "
"stat_blocked and stat_runtime require the " "stat_blocked and stat_runtime require the "
"kernel parameter schedstats=enabled or " "kernel parameter schedstats=enable or "
"kernel.sched_schedstats=1\n"); "kernel.sched_schedstats=1\n");
} }
#endif #endif