mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init: Makefile: delete duplicate args for mkcompile_h

Browse Source 
init: init_task: delete cpus_requested in struct task_struct init_task
kernel: sched: fix error using of cpus_ptr in task_struct *p
  cpus_allowed has been instead by cpus_ptr

Signed-off-by: jianlong.wang <jianlong.wang@rock-chips.com>
Change-Id: Ia3e90ff9d8871691baf035fb5b0ded7b9591532f
This commit is contained in:
jianlong.wang
2021-10-28 10:32:51 +08:00
parent e7e5540547
commit 9b4ca23f63
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
init/Makefile
View File

@@ -32,6 +32,5 @@ include/generated/compile.h: FORCE
@$($(quiet)chk_compile.h)
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \
"$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" \
"$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" \
"$(CONFIG_PREEMPT_RT_FULL)" "$(CC) $(KBUILD_CFLAGS)" \
"$(LD)"

1
init/init_task.c
View File

@@ -85,7 +85,6 @@ struct task_struct init_task
defined(CONFIG_SCHED_DEBUG)
.pinned_on_cpu = -1,
#endif
.cpus_requested = CPU_MASK_ALL,
.mm = NULL,
.active_mm = &init_mm,
.restart_block = {

2
kernel/sched/core.c
View File

@@ -2800,7 +2800,7 @@ EXPORT_SYMBOL(wake_up_process);
*/
int wake_up_lock_sleeper(struct task_struct *p)
{
return try_to_wake_up(p, TASK_UNINTERRUPTIBLE, WF_LOCK_SLEEPER);
return try_to_wake_up(p, TASK_UNINTERRUPTIBLE, WF_LOCK_SLEEPER, 1);
}
int wake_up_state(struct task_struct *p, unsigned int state)

8
kernel/sched/fair.c
View File

@@ -6703,7 +6703,7 @@ static void find_best_target(struct sched_domain *sd, cpumask_t *cpus,
/* Scan CPUs in all SDs */
sg = sd->groups;
do {
for_each_cpu_and(i, &p->cpus_allowed, sched_group_span(sg)) {
for_each_cpu_and(i, p->cpus_ptr, sched_group_span(sg)) {
unsigned long capacity_curr = capacity_curr_of(i);
unsigned long capacity_orig = capacity_orig_of(i);
unsigned long wake_util, new_util;
@@ -7121,7 +7121,7 @@ static void select_cpu_candidates(struct sched_domain *sd, cpumask_t *cpus,
max_spare_cap = 0;
for_each_cpu_and(cpu, perf_domain_span(pd), sched_domain_span(sd)) {
if (!cpumask_test_cpu(cpu, &p->cpus_allowed))
if (!cpumask_test_cpu(cpu, p->cpus_ptr))
continue;
util = cpu_util_next(cpu, p, cpu);
@@ -7239,7 +7239,7 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu, int sy
if (sysctl_sched_sync_hint_enable && sync) {
cpu = smp_processor_id();
if (cpumask_test_cpu(cpu, &p->cpus_allowed))
if (cpumask_test_cpu(cpu, p->cpus_ptr))
return cpu;
}
@@ -7284,7 +7284,7 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu, int sy
goto unlock;
}
if (cpumask_test_cpu(prev_cpu, &p->cpus_allowed))
if (cpumask_test_cpu(prev_cpu, p->cpus_ptr))
prev_energy = best_energy = compute_energy(p, prev_cpu, pd);
else
prev_energy = best_energy = ULONG_MAX;