diff options
| author | Christoph Lameter <cl@linux.com> | 2014-08-26 20:12:21 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-08-28 08:58:57 -0400 |
| commit | 4ba2968420fa9d0604b6a6a5c61bfa8d0fa84ae0 (patch) | |
| tree | a1051b2a4a23ae8f943f3ae97c0adf6b594e2df0 /kernel/sched/rt.c | |
| parent | 23f66e2d661b4d3226d16e25910a9e9472ce2410 (diff) | |
percpu: Resolve ambiguities in __get_cpu_var/cpumask_var_t
__get_cpu_var can paper over differences in the definitions of
cpumask_var_t and either use the address of the cpumask variable
directly or perform a fetch of the address of the struct cpumask
allocated elsewhere. This is important particularly when using per cpu
cpumask_var_t declarations because in one case we have an offset into
a per cpu area to handle and in the other case we need to fetch a
pointer from the offset.
This patch introduces a new macro
this_cpu_cpumask_var_ptr()
that is defined where cpumask_var_t is defined and performs the proper
actions. All use cases where __get_cpu_var is used with cpumask_var_t
are converted to the use of this_cpu_cpumask_var_ptr().
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/sched/rt.c')
| -rw-r--r-- | kernel/sched/rt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 5f6edca4fafd..a4c50fce9b90 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c | |||
| @@ -1526,7 +1526,7 @@ static DEFINE_PER_CPU(cpumask_var_t, local_cpu_mask); | |||
| 1526 | static int find_lowest_rq(struct task_struct *task) | 1526 | static int find_lowest_rq(struct task_struct *task) |
| 1527 | { | 1527 | { |
| 1528 | struct sched_domain *sd; | 1528 | struct sched_domain *sd; |
| 1529 | struct cpumask *lowest_mask = __get_cpu_var(local_cpu_mask); | 1529 | struct cpumask *lowest_mask = this_cpu_cpumask_var_ptr(local_cpu_mask); |
| 1530 | int this_cpu = smp_processor_id(); | 1530 | int this_cpu = smp_processor_id(); |
| 1531 | int cpu = task_cpu(task); | 1531 | int cpu = task_cpu(task); |
| 1532 | 1532 | ||
