Unverified Commit 1b688d5f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15375 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.60-6.6.61 LTS Conflicts Patches 

Merge Pull Request from: @koishimind 
 
Submit after modification(1):
1. posix-cpu-timers: Clear TICK_DEP_BIT_POSIX_TIMER on clone 
 
Link:https://gitee.com/openeuler/kernel/pulls/15375

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 5ea1a178 f85b3a02

include/linux/tick.h

+8 −0
Original line number Diff line number Diff line
@@ -259,12 +259,19 @@ static inline void tick_dep_set_task(struct task_struct *tsk, 
	if (tick_nohz_full_enabled())

		tick_nohz_dep_set_task(tsk, bit);

}



static inline void tick_dep_clear_task(struct task_struct *tsk,

				       enum tick_dep_bits bit)

{

	if (tick_nohz_full_enabled())

		tick_nohz_dep_clear_task(tsk, bit);

}



static inline void tick_dep_init_task(struct task_struct *tsk)

{

	atomic_set(&tsk->tick_dep_mask, 0);

}



static inline void tick_dep_set_signal(struct task_struct *tsk,

				       enum tick_dep_bits bit)

{
@@ -298,6 +305,7 @@ static inline void tick_dep_set_task(struct task_struct *tsk, 
				     enum tick_dep_bits bit) { }

static inline void tick_dep_clear_task(struct task_struct *tsk,

				       enum tick_dep_bits bit) { }

static inline void tick_dep_init_task(struct task_struct *tsk) { }

static inline void tick_dep_set_signal(struct task_struct *tsk,

				       enum tick_dep_bits bit) { }

static inline void tick_dep_clear_signal(struct signal_struct *signal,

kernel/fork.c

+2 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ 
#include <linux/sched/grid_qos.h>

#endif

#include <linux/share_pool.h>

#include <linux/tick.h>



#include <asm/pgalloc.h>

#include <linux/uaccess.h>
@@ -2516,6 +2517,7 @@ __latent_entropy struct task_struct *copy_process( 
	acct_clear_integrals(p);



	posix_cputimers_init(&p->posix_cputimers);

	tick_dep_init_task(p);



	p->io_context = NULL;

	audit_set_context(p, NULL);