Subject: [PATCH 18/31] arm: Replace __this_cpu_ptr with raw_cpu_ptr

__this_cpu_ptr is being phased out. So replace with raw_cpu_ptr.

Cc: Russell King <[email protected]>
Cc: Catalin Marinas <[email protected]>
CC: Will Deacon <[email protected]>
Signed-off-by: Christoph Lameter <[email protected]>

Index: linux/arch/arm/kernel/smp_twd.c
===================================================================
--- linux.orig/arch/arm/kernel/smp_twd.c 2014-04-14 13:33:53.858921317 -0500
+++ linux/arch/arm/kernel/smp_twd.c 2014-04-14 13:33:53.854921395 -0500
@@ -92,7 +92,7 @@

static void twd_timer_stop(void)
{
- struct clock_event_device *clk = __this_cpu_ptr(twd_evt);
+ struct clock_event_device *clk = raw_cpu_ptr(twd_evt);

twd_set_mode(CLOCK_EVT_MODE_UNUSED, clk);
disable_percpu_irq(clk->irq);
@@ -108,7 +108,7 @@
{
twd_timer_rate = *((unsigned long *) new_rate);

- clockevents_update_freq(__this_cpu_ptr(twd_evt), twd_timer_rate);
+ clockevents_update_freq(raw_cpu_ptr(twd_evt), twd_timer_rate);
}

static int twd_rate_change(struct notifier_block *nb,
@@ -134,7 +134,7 @@

static int twd_clk_init(void)
{
- if (twd_evt && __this_cpu_ptr(twd_evt) && !IS_ERR(twd_clk))
+ if (twd_evt && raw_cpu_ptr(twd_evt) && !IS_ERR(twd_clk))
return clk_notifier_register(twd_clk, &twd_clk_nb);

return 0;
@@ -153,7 +153,7 @@
{
twd_timer_rate = clk_get_rate(twd_clk);

- clockevents_update_freq(__this_cpu_ptr(twd_evt), twd_timer_rate);
+ clockevents_update_freq(raw_cpu_ptr(twd_evt), twd_timer_rate);
}

static int twd_cpufreq_transition(struct notifier_block *nb,
@@ -179,7 +179,7 @@

static int twd_cpufreq_init(void)
{
- if (twd_evt && __this_cpu_ptr(twd_evt) && !IS_ERR(twd_clk))
+ if (twd_evt && raw_cpu_ptr(twd_evt) && !IS_ERR(twd_clk))
return cpufreq_register_notifier(&twd_cpufreq_nb,
CPUFREQ_TRANSITION_NOTIFIER);

@@ -269,7 +269,7 @@
*/
static void twd_timer_setup(void)
{
- struct clock_event_device *clk = __this_cpu_ptr(twd_evt);
+ struct clock_event_device *clk = raw_cpu_ptr(twd_evt);
int cpu = smp_processor_id();

/*


2014-07-18 23:31:07

by Tejun Heo

[permalink] [raw]
Subject: Re: [PATCH 18/31] arm: Replace __this_cpu_ptr with raw_cpu_ptr

On Fri, Jun 20, 2014 at 02:31:33PM -0500, Christoph Lameter wrote:
> __this_cpu_ptr is being phased out. So replace with raw_cpu_ptr.
>
> Cc: Russell King <[email protected]>
> Cc: Catalin Marinas <[email protected]>
> CC: Will Deacon <[email protected]>
> Signed-off-by: Christoph Lameter <[email protected]>

Applied to wq/for-3.17-consistent-ops. If this patch should be routed
differently, please holler.

Thanks.

--
tejun