From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Mar 2022 21:39:12 +0000 (-0700)
Subject: Merge tag 'sched-core-2022-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: microblaze-v5.19~175
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=3fe2f7446f1e029b220f7f650df6d138f91651f2;p=linux-2.6-microblaze.git

Merge tag 'sched-core-2022-03-22' of git://git./linux/kernel/git/tip/tip

Pull scheduler updates from Ingo Molnar:

 - Cleanups for SCHED_DEADLINE

 - Tracing updates/fixes

 - CPU Accounting fixes

 - First wave of changes to optimize the overhead of the scheduler
   build, from the fast-headers tree - including placeholder *_api.h
   headers for later header split-ups.

 - Preempt-dynamic using static_branch() for ARM64

 - Isolation housekeeping mask rework; preperatory for further changes

 - NUMA-balancing: deal with CPU-less nodes

 - NUMA-balancing: tune systems that have multiple LLC cache domains per
   node (eg. AMD)

 - Updates to RSEQ UAPI in preparation for glibc usage

 - Lots of RSEQ/selftests, for same

 - Add Suren as PSI co-maintainer

* tag 'sched-core-2022-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (81 commits)
  sched/headers: ARM needs asm/paravirt_api_clock.h too
  sched/numa: Fix boot crash on arm64 systems
  headers/prep: Fix header to build standalone: <linux/psi.h>
  sched/headers: Only include <linux/entry-common.h> when CONFIG_GENERIC_ENTRY=y
  cgroup: Fix suspicious rcu_dereference_check() usage warning
  sched/preempt: Tell about PREEMPT_DYNAMIC on kernel headers
  sched/topology: Remove redundant variable and fix incorrect type in build_sched_domains
  sched/deadline,rt: Remove unused parameter from pick_next_[rt|dl]_entity()
  sched/deadline,rt: Remove unused functions for !CONFIG_SMP
  sched/deadline: Use __node_2_[pdl|dle]() and rb_first_cached() consistently
  sched/deadline: Merge dl_task_can_attach() and dl_cpu_busy()
  sched/deadline: Move bandwidth mgmt and reclaim functions into sched class source file
  sched/deadline: Remove unused def_dl_bandwidth
  sched/tracing: Report TASK_RTLOCK_WAIT tasks as TASK_UNINTERRUPTIBLE
  sched/tracing: Don't re-read p->state when emitting sched_switch event
  sched/rt: Plug rt_mutex_setprio() vs push_rt_task() race
  sched/cpuacct: Remove redundant RCU read lock
  sched/cpuacct: Optimize away RCU read lock
  sched/cpuacct: Fix charge percpu cpuusage
  sched/headers: Reorganize, clean up and optimize kernel/sched/sched.h dependencies
  ...
---

3fe2f7446f1e029b220f7f650df6d138f91651f2
diff --cc kernel/rcu/tree_plugin.h
index 6082dd23408f,65f25a32f6d7..8360d86db1c0
--- a/kernel/rcu/tree_plugin.h
+++ b/kernel/rcu/tree_plugin.h
@@@ -1218,11 -1214,10 +1218,11 @@@ static void rcu_boost_kthread_setaffini
  		if ((mask & leaf_node_cpu_bit(rnp, cpu)) &&
  		    cpu != outgoingcpu)
  			cpumask_set_cpu(cpu, cm);
- 	cpumask_and(cm, cm, housekeeping_cpumask(HK_FLAG_RCU));
+ 	cpumask_and(cm, cm, housekeeping_cpumask(HK_TYPE_RCU));
 -	if (cpumask_weight(cm) == 0)
 +	if (cpumask_empty(cm))
- 		cpumask_copy(cm, housekeeping_cpumask(HK_FLAG_RCU));
+ 		cpumask_copy(cm, housekeeping_cpumask(HK_TYPE_RCU));
  	set_cpus_allowed_ptr(t, cm);
 +	mutex_unlock(&rnp->boost_kthread_mutex);
  	free_cpumask_var(cm);
  }