Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06b96c8b authored by Christoph Lameter's avatar Christoph Lameter Committed by Tejun Heo
Browse files

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 <linux@arm.linux.org.uk>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent e1632170

arch/arm/kernel/smp_twd.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -92,7 +92,7 @@ static int twd_timer_ack(void) 




static void twd_timer_stop(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);

	twd_set_mode(CLOCK_EVT_MODE_UNUSED, clk);

	disable_percpu_irq(clk->irq);

	disable_percpu_irq(clk->irq);
@@ -108,7 +108,7 @@ static void twd_update_frequency(void *new_rate) 
{

{

	twd_timer_rate = *((unsigned long *) new_rate);

	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,

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)

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 clk_notifier_register(twd_clk, &twd_clk_nb);





	return 0;

	return 0;
@@ -153,7 +153,7 @@ static void twd_update_frequency(void *data) 
{

{

	twd_timer_rate = clk_get_rate(twd_clk);

	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,

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




static int twd_cpufreq_init(void)

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,

		return cpufreq_register_notifier(&twd_cpufreq_nb,

			CPUFREQ_TRANSITION_NOTIFIER);

			CPUFREQ_TRANSITION_NOTIFIER);
@@ -269,7 +269,7 @@ static void twd_get_clock(struct device_node *np) 
 */

 */

static void twd_timer_setup(void)

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();

	int cpu = smp_processor_id();





	/*

	/*