From: Christoph Lameter <cl@linux.com>
To: Tejun Heo <tj@kernel.org>
Cc: akpm@linuxfoundation.org, rostedt@goodmis.org,
linux-kernel@vger.kernel.org, Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
x86@kernel.org, "H. Peter Anvin" <hpa@linux.intel.com>
Subject: [PATCH 30/48] x86: Change __get_cpu_var calls introduced in 3.14
Date: Fri, 14 Feb 2014 14:19:11 -0600 [thread overview]
Message-ID: <20140214201907.125542389@linux.com> (raw)
In-Reply-To: 20140214201841.826179349@linux.com
[-- Attachment #1: fix_rapl --]
[-- Type: text/plain, Size: 3176 bytes --]
More were added recently.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86@kernel.org
Cc: H. Peter Anvin <hpa@linux.intel.com>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Christoph Lameter <cl@linux.com>
Index: linux/arch/x86/kernel/cpu/perf_event_intel_rapl.c
===================================================================
--- linux.orig/arch/x86/kernel/cpu/perf_event_intel_rapl.c 2014-02-03 13:36:13.429026651 -0600
+++ linux/arch/x86/kernel/cpu/perf_event_intel_rapl.c 2014-02-03 13:36:13.429026651 -0600
@@ -129,7 +129,7 @@
* or use ldexp(count, -32).
* Watts = Joules/Time delta
*/
- return v << (32 - __get_cpu_var(rapl_pmu)->hw_unit);
+ return v << (32 - __this_cpu_read(rapl_pmu->hw_unit));
}
static u64 rapl_event_update(struct perf_event *event)
@@ -181,7 +181,7 @@
static enum hrtimer_restart rapl_hrtimer_handle(struct hrtimer *hrtimer)
{
- struct rapl_pmu *pmu = __get_cpu_var(rapl_pmu);
+ struct rapl_pmu *pmu = __this_cpu_read(rapl_pmu);
struct perf_event *event;
unsigned long flags;
@@ -228,7 +228,7 @@
static void rapl_pmu_event_start(struct perf_event *event, int mode)
{
- struct rapl_pmu *pmu = __get_cpu_var(rapl_pmu);
+ struct rapl_pmu *pmu = __this_cpu_read(rapl_pmu);
unsigned long flags;
spin_lock_irqsave(&pmu->lock, flags);
@@ -238,7 +238,7 @@
static void rapl_pmu_event_stop(struct perf_event *event, int mode)
{
- struct rapl_pmu *pmu = __get_cpu_var(rapl_pmu);
+ struct rapl_pmu *pmu = __this_cpu_read(rapl_pmu);
struct hw_perf_event *hwc = &event->hw;
unsigned long flags;
@@ -272,7 +272,7 @@
static int rapl_pmu_event_add(struct perf_event *event, int mode)
{
- struct rapl_pmu *pmu = __get_cpu_var(rapl_pmu);
+ struct rapl_pmu *pmu = __this_cpu_read(rapl_pmu);
struct hw_perf_event *hwc = &event->hw;
unsigned long flags;
@@ -662,7 +662,7 @@
return -1;
}
- pmu = __get_cpu_var(rapl_pmu);
+ pmu = __this_cpu_read(rapl_pmu);
pr_info("RAPL PMU detected, hw unit 2^-%d Joules,"
" API unit is 2^-32 Joules,"
Index: linux/kernel/sched/deadline.c
===================================================================
--- linux.orig/kernel/sched/deadline.c 2014-02-03 13:36:13.429026651 -0600
+++ linux/kernel/sched/deadline.c 2014-02-03 13:36:13.429026651 -0600
@@ -1115,7 +1115,7 @@
static int find_later_rq(struct task_struct *task)
{
struct sched_domain *sd;
- struct cpumask *later_mask = __get_cpu_var(local_cpu_mask_dl);
+ struct cpumask *later_mask = this_cpu_ptr(local_cpu_mask_dl);
int this_cpu = smp_processor_id();
int best_cpu, cpu = task_cpu(task);
Index: linux/kernel/time/tick-broadcast.c
===================================================================
--- linux.orig/kernel/time/tick-broadcast.c 2014-02-03 13:36:13.429026651 -0600
+++ linux/kernel/time/tick-broadcast.c 2014-02-03 13:36:13.429026651 -0600
@@ -541,7 +541,7 @@
void tick_check_oneshot_broadcast_this_cpu(void)
{
if (cpumask_test_cpu(smp_processor_id(), tick_broadcast_oneshot_mask)) {
- struct tick_device *td = &__get_cpu_var(tick_cpu_device);
+ struct tick_device *td = this_cpu_ptr(&tick_cpu_device);
/*
* We might be in the middle of switching over from
next prev parent reply other threads:[~2014-02-14 20:20 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-14 20:18 [PATCH 00/48] percpu: Consistent per cpu operations V4 Christoph Lameter
2014-02-14 20:18 ` [PATCH 01/48] percpu: Add raw_cpu_ops Christoph Lameter
2014-02-14 20:18 ` [PATCH 02/48] mm: Use raw_cpu ops for determining current NUMA node Christoph Lameter
2014-02-14 20:18 ` [PATCH 03/48] modules: Use raw_cpu_write for initialization of per cpu refcount Christoph Lameter
2014-02-14 20:18 ` [PATCH 04/48] net: Replace __this_cpu_inc in route.c with raw_cpu_inc Christoph Lameter
2014-02-14 20:18 ` [PATCH 05/48] percpu: Add preemption checks to __this_cpu ops Christoph Lameter
2014-03-04 22:27 ` Andrew Morton
2014-03-04 23:27 ` Steven Rostedt
2014-03-05 3:27 ` Christoph Lameter
2014-03-05 21:34 ` Andrew Morton
2014-02-14 20:18 ` [PATCH 06/48] mm: Replace __get_cpu_var uses with this_cpu_ptr Christoph Lameter
2014-02-14 20:18 ` [PATCH 07/48] tracing: " Christoph Lameter
2014-02-14 20:18 ` [PATCH 08/48] percpu: Replace __get_cpu_var " Christoph Lameter
2014-02-14 20:18 ` [PATCH 09/48] kernel misc: Replace __get_cpu_var uses Christoph Lameter
2014-02-14 20:18 ` [PATCH 10/48] drivers/char/random: " Christoph Lameter
2014-02-14 20:18 ` [PATCH 11/48] drivers/cpuidle: Replace __get_cpu_var uses for address calculation Christoph Lameter
2014-02-14 20:18 ` [PATCH 12/48] drivers/oprofile: " Christoph Lameter
2014-02-14 20:18 ` [PATCH 13/48] drivers/leds: Replace __get_cpu_var use through this_cpu_ptr Christoph Lameter
2014-02-14 20:18 ` [PATCH 14/48] drivers/clocksource: Replace __get_cpu_var used for address calculation Christoph Lameter
2014-02-14 20:18 ` [PATCH 15/48] parisc: Replace __get_cpu_var uses " Christoph Lameter
2014-02-14 20:18 ` [PATCH 16/48] metag: " Christoph Lameter
2014-02-14 20:18 ` [PATCH 17/48] drivers/net/ethernet/tile: " Christoph Lameter
2014-02-14 20:18 ` [PATCH 18/48] drivers/net/ethernet/tile: __get_cpu_var call introduced in 3.14 Christoph Lameter
2014-02-14 20:19 ` [PATCH 19/48] tilegx: Another case of get_cpu_var Christoph Lameter
2014-02-14 20:19 ` [PATCH 20/48] time: Replace __get_cpu_var uses Christoph Lameter
2014-02-15 11:33 ` Thomas Gleixner
2014-02-14 20:19 ` [PATCH 21/48] scheduler: Replace __get_cpu_var with this_cpu_ptr Christoph Lameter
2014-02-14 20:19 ` [PATCH 22/48] tick-sched: Fix two new uses of __get_cpu_ptr Christoph Lameter
2014-02-15 11:33 ` Thomas Gleixner
2014-02-14 20:19 ` [PATCH 23/48] block: Replace __this_cpu_ptr with raw_cpu_ptr Christoph Lameter
2014-02-14 20:19 ` [PATCH 24/48] rcu: Replace __this_cpu_ptr uses " Christoph Lameter
2014-02-16 16:17 ` Paul E. McKenney
2014-02-14 20:19 ` [PATCH 25/48] watchdog: Replace __raw_get_cpu_var uses Christoph Lameter
2014-02-14 20:19 ` [PATCH 26/48] net: Replace get_cpu_var through this_cpu_ptr Christoph Lameter
2014-02-14 20:19 ` [PATCH 27/48] md: Replace __this_cpu_ptr with raw_cpu_ptr Christoph Lameter
2014-02-14 20:19 ` [PATCH 28/48] irqchips: Replace __this_cpu_ptr uses Christoph Lameter
2014-02-14 20:19 ` [PATCH 29/48] x86: Replace __get_cpu_var uses Christoph Lameter
2014-02-14 20:19 ` Christoph Lameter [this message]
2014-02-14 20:19 ` [PATCH 31/48] uv: Replace __get_cpu_var Christoph Lameter
2014-03-04 23:02 ` Andrew Morton
2014-03-04 23:42 ` Steven Rostedt
2014-03-04 23:47 ` Andrew Morton
2014-03-05 0:18 ` H. Peter Anvin
2014-03-05 3:31 ` Christoph Lameter
2014-03-05 4:00 ` Andrew Morton
2014-03-05 15:35 ` Christoph Lameter
2014-03-05 21:57 ` Christoph Lameter
2014-03-06 2:53 ` Mike Travis
2014-03-07 18:16 ` Christoph Lameter
2014-02-14 20:19 ` [PATCH 32/48] arm: Replace __this_cpu_ptr with raw_cpu_ptr Christoph Lameter
2014-02-14 20:19 ` [PATCH 33/48] MIPS: Replace __get_cpu_var uses in FPU emulator Christoph Lameter
2014-02-14 20:19 ` [PATCH 34/48] mips: Replace __get_cpu_var uses Christoph Lameter
2014-02-14 20:19 ` [PATCH 35/48] s390: rename __this_cpu_ptr to raw_cpu_ptr Christoph Lameter
2014-02-14 20:19 ` [PATCH 36/48] s390: Replace __get_cpu_var uses Christoph Lameter
2014-02-14 20:19 ` [PATCH 37/48] s390: Handle new __get_cpu_var calls added in 3.14 Christoph Lameter
2014-02-14 20:19 ` [PATCH 38/48] ia64: Replace __get_cpu_var uses Christoph Lameter
2014-02-14 20:19 ` [PATCH 39/48] powerpc: " Christoph Lameter
2014-02-15 3:50 ` Benjamin Herrenschmidt
2014-02-15 4:26 ` Steven Rostedt
2014-02-15 7:54 ` Mike Galbraith
2014-02-15 10:00 ` Benjamin Herrenschmidt
2014-02-15 11:29 ` Mike Galbraith
2014-02-15 9:59 ` Benjamin Herrenschmidt
2014-02-15 9:42 ` Peter Zijlstra
2014-02-15 10:01 ` Benjamin Herrenschmidt
2014-02-15 12:07 ` Andreas Schwab
2014-02-15 15:45 ` Peter Zijlstra
2014-02-15 18:12 ` David Woodhouse
2014-02-15 20:32 ` Benjamin Herrenschmidt
2014-02-15 20:52 ` Benjamin Herrenschmidt
2014-02-14 20:19 ` [PATCH 40/48] powerpc: Handle new __get_cpu_var calls in 3.14 Christoph Lameter
2014-02-14 20:19 ` [PATCH 41/48] sparc: Replace __get_cpu_var uses Christoph Lameter
2014-02-14 20:19 ` [PATCH 42/48] tile: " Christoph Lameter
2014-02-14 20:19 ` [PATCH 43/48] blackfin: " Christoph Lameter
2014-02-14 20:19 ` [PATCH 44/48] avr32: Replace __get_cpu_var with __this_cpu_write Christoph Lameter
2014-02-14 20:19 ` [PATCH 45/48] alpha: Replace __get_cpu_var Christoph Lameter
2014-02-14 20:19 ` [PATCH 46/48] sh: Replace __get_cpu_var uses Christoph Lameter
2014-02-14 20:19 ` [PATCH 47/48] Remove __get_cpu_var and __raw_get_cpu_var macros [only in 3.16] Christoph Lameter
2014-02-14 20:19 ` [PATCH 48/48] percpu: Remove __this_cpu_ptr Christoph Lameter
2014-03-04 22:27 ` [PATCH 00/48] percpu: Consistent per cpu operations V4 Andrew Morton
2014-03-05 3:29 ` Christoph Lameter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140214201907.125542389@linux.com \
--to=cl@linux.com \
--cc=akpm@linuxfoundation.org \
--cc=hpa@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox