Skip to content

Commit

Permalink
Merge tag 'v6.12.3' into HEAD
Browse files Browse the repository at this point in the history
 * Linux 6.12.3

Signed-off-by: Yang Jeong Hun <onyxclover9931@gmail.com>
  • Loading branch information
Nevuly committed Dec 6, 2024
2 parents 9560e4f + 47edb26 commit af02107
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 6
PATCHLEVEL = 12
SUBLEVEL = 2
SUBLEVEL = 3
EXTRAVERSION =
NAME = Baby Opossum Posse

Expand Down
12 changes: 5 additions & 7 deletions kernel/sched/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -4424,7 +4424,8 @@ int wake_up_state(struct task_struct *p, unsigned int state)
* Perform scheduler related setup for a newly forked process p.
* p is forked by current.
*
* __sched_fork() is basic setup used by init_idle() too:
* __sched_fork() is basic setup which is also used by sched_init() to
* initialize the boot CPU's idle task.
*/
static void __sched_fork(unsigned long clone_flags, struct task_struct *p)
{
Expand Down Expand Up @@ -7683,8 +7684,6 @@ void __init init_idle(struct task_struct *idle, int cpu)
struct rq *rq = cpu_rq(cpu);
unsigned long flags;

__sched_fork(0, idle);

raw_spin_lock_irqsave(&idle->pi_lock, flags);
raw_spin_rq_lock(rq);

Expand All @@ -7699,10 +7698,8 @@ void __init init_idle(struct task_struct *idle, int cpu)

#ifdef CONFIG_SMP
/*
* It's possible that init_idle() gets called multiple times on a task,
* in that case do_set_cpus_allowed() will not do the right thing.
*
* And since this is boot we can forgo the serialization.
* No validation and serialization required at boot time and for
* setting up the idle tasks of not yet online CPUs.
*/
set_cpus_allowed_common(idle, &ac);
#endif
Expand Down Expand Up @@ -8546,6 +8543,7 @@ void __init sched_init(void)
* but because we are the idle thread, we just pick up running again
* when this runqueue becomes "idle".
*/
__sched_fork(0, current);
init_idle(current, smp_processor_id());

calc_load_update = jiffies + LOAD_FREQ;
Expand Down

0 comments on commit af02107

Please sign in to comment.