On Sun, Aug 17, 2014 at 06:30:42PM +0100, Christoph Lameter wrote:
> __this_cpu_ptr is being phased out. So replace with raw_cpu_ptr.
>
> Cc: Russell King <li...@arm.linux.org.uk>
> Cc: Catalin Marinas <catalin.mari...@arm.com>
> CC: Will Deacon <will.dea...@arm.com>
> Signed-off-by: Christoph Lameter <c...@linux.com>
> ---
> arch/arm/kernel/smp_twd.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
Looks good to me:
Acked-by: Will Deacon <will.dea...@arm.com>
Will
> Index: linux/arch/arm/kernel/smp_twd.c
> ===================================================================
> --- linux.orig/arch/arm/kernel/smp_twd.c
> +++ linux/arch/arm/kernel/smp_twd.c
> @@ -92,7 +92,7 @@ static int twd_timer_ack(void)
>
> 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 @@ static void twd_update_frequency(void *n
> {
> 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 struct notifier_block twd_clk_nb
>
> 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 @@ static void twd_update_frequency(void *d
> {
> 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 struct notifier_block twd_cpufreq
>
> 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_get_clock(struct device_
> */
> 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();
>
> /*
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
