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

Commit 29baa747 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

sched: Move nr_cpus_allowed out of 'struct sched_rt_entity' 



Since nr_cpus_allowed is used outside of sched/rt.c and wants to be
used outside of there more, move it to a more natural site.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-kr61f02y9brwzkh6x53pdptm@git.kernel.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent b654f7de

arch/blackfin/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ asmlinkage int bfin_clone(struct pt_regs *regs) 
	unsigned long newsp;



#ifdef __ARCH_SYNC_CORE_DCACHE

	if (current->rt.nr_cpus_allowed == num_possible_cpus())

	if (current->nr_cpus_allowed == num_possible_cpus())

		set_cpus_allowed_ptr(current, cpumask_of(smp_processor_id()));

#endif

include/linux/init_task.h

+1 −1
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ extern struct cred init_cred; 
	.normal_prio	= MAX_PRIO-20,					\

	.policy		= SCHED_NORMAL,					\

	.cpus_allowed	= CPU_MASK_ALL,					\

	.nr_cpus_allowed= NR_CPUS,					\

	.mm		= NULL,						\

	.active_mm	= &init_mm,					\

	.se		= {						\
@@ -157,7 +158,6 @@ extern struct cred init_cred; 
	.rt		= {						\

		.run_list	= LIST_HEAD_INIT(tsk.rt.run_list),	\

		.time_slice	= RR_TIMESLICE,				\

		.nr_cpus_allowed = NR_CPUS,				\

	},								\

	.tasks		= LIST_HEAD_INIT(tsk.tasks),			\

	INIT_PUSHABLE_TASKS(tsk)					\

include/linux/sched.h

+1 −1
Original line number Diff line number Diff line
@@ -1188,7 +1188,6 @@ struct sched_rt_entity { 
	struct list_head run_list;

	unsigned long timeout;

	unsigned int time_slice;

	int nr_cpus_allowed;



	struct sched_rt_entity *back;

#ifdef CONFIG_RT_GROUP_SCHED
@@ -1253,6 +1252,7 @@ struct task_struct { 
#endif



	unsigned int policy;

	int nr_cpus_allowed;

	cpumask_t cpus_allowed;



#ifdef CONFIG_PREEMPT_RCU

kernel/sched/core.c

+1 −1
Original line number Diff line number Diff line
@@ -5015,7 +5015,7 @@ void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask) 
		p->sched_class->set_cpus_allowed(p, new_mask);



	cpumask_copy(&p->cpus_allowed, new_mask);

	p->rt.nr_cpus_allowed = cpumask_weight(new_mask);

	p->nr_cpus_allowed = cpumask_weight(new_mask);

}



/*

kernel/sched/fair.c

+1 −1
Original line number Diff line number Diff line
@@ -2703,7 +2703,7 @@ select_task_rq_fair(struct task_struct *p, int sd_flag, int wake_flags) 
	int want_sd = 1;

	int sync = wake_flags & WF_SYNC;



	if (p->rt.nr_cpus_allowed == 1)

	if (p->nr_cpus_allowed == 1)

		return prev_cpu;



	if (sd_flag & SD_BALANCE_WAKE) {