diff options
| author | Christoph Lameter <cl@linux.com> | 2014-08-17 19:30:27 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-08-26 19:45:45 +0200 |
| commit | 4a32fea9d78f2d2315c0072757b197d5a304dc8b (patch) | |
| tree | 6cb53d3bb67bed81671ff9ff38d2f48d118a2345 /kernel/events/callchain.c | |
| parent | time: Convert a bunch of &__get_cpu_var introduced in the 3.16 merge period (diff) | |
| download | linux-4a32fea9d78f2d2315c0072757b197d5a304dc8b.tar.xz linux-4a32fea9d78f2d2315c0072757b197d5a304dc8b.zip | |
scheduler: Replace __get_cpu_var with this_cpu_ptr
Convert all uses of __get_cpu_var for address calculation to use
this_cpu_ptr instead.
[Uses of __get_cpu_var with cpumask_var_t are no longer
handled by this patch]
Cc: Peter Zijlstra <peterz@infradead.org>
Acked-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/events/callchain.c')
| -rw-r--r-- | kernel/events/callchain.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c index 97b67df8fbfe..c4f63e68a35c 100644 --- a/kernel/events/callchain.c +++ b/kernel/events/callchain.c @@ -137,7 +137,7 @@ static struct perf_callchain_entry *get_callchain_entry(int *rctx) int cpu; struct callchain_cpus_entries *entries; - *rctx = get_recursion_context(__get_cpu_var(callchain_recursion)); + *rctx = get_recursion_context(this_cpu_ptr(callchain_recursion)); if (*rctx == -1) return NULL; @@ -153,7 +153,7 @@ static struct perf_callchain_entry *get_callchain_entry(int *rctx) static void put_callchain_entry(int rctx) { - put_recursion_context(__get_cpu_var(callchain_recursion), rctx); + put_recursion_context(this_cpu_ptr(callchain_recursion), rctx); } struct perf_callchain_entry * |