aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorChristoph Lameter <cl@linux.com>2014-08-17 13:30:42 -0400
committerTejun Heo <tj@kernel.org>2014-08-26 13:45:50 -0400
commit06b96c8beb940619ddc818e2e00915fbc524f807 (patch)
tree46f3f18916e8440ee16273ed4600acfffe3e1856 /arch/arm
parente16321709c8270f9803bbfdb51e5e02235078c7f (diff)
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: Will Deacon <will.deacon@arm.com> Signed-off-by: Christoph Lameter <cl@linux.com> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/kernel/smp_twd.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
index dfc32130bc44..93090213c71c 100644
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c
@@ -92,7 +92,7 @@ static int twd_timer_ack(void)
92 92
93static void twd_timer_stop(void) 93static void twd_timer_stop(void)
94{ 94{
95 struct clock_event_device *clk = __this_cpu_ptr(twd_evt); 95 struct clock_event_device *clk = raw_cpu_ptr(twd_evt);
96 96
97 twd_set_mode(CLOCK_EVT_MODE_UNUSED, clk); 97 twd_set_mode(CLOCK_EVT_MODE_UNUSED, clk);
98 disable_percpu_irq(clk->irq); 98 disable_percpu_irq(clk->irq);
@@ -108,7 +108,7 @@ static void twd_update_frequency(void *new_rate)
108{ 108{
109 twd_timer_rate = *((unsigned long *) new_rate); 109 twd_timer_rate = *((unsigned long *) new_rate);
110 110
111 clockevents_update_freq(__this_cpu_ptr(twd_evt), twd_timer_rate); 111 clockevents_update_freq(raw_cpu_ptr(twd_evt), twd_timer_rate);
112} 112}
113 113
114static int twd_rate_change(struct notifier_block *nb, 114static int twd_rate_change(struct notifier_block *nb,
@@ -134,7 +134,7 @@ static struct notifier_block twd_clk_nb = {
134 134
135static int twd_clk_init(void) 135static int twd_clk_init(void)
136{ 136{
137 if (twd_evt && __this_cpu_ptr(twd_evt) && !IS_ERR(twd_clk)) 137 if (twd_evt && raw_cpu_ptr(twd_evt) && !IS_ERR(twd_clk))
138 return clk_notifier_register(twd_clk, &twd_clk_nb); 138 return clk_notifier_register(twd_clk, &twd_clk_nb);
139 139
140 return 0; 140 return 0;
@@ -153,7 +153,7 @@ static void twd_update_frequency(void *data)
153{ 153{
154 twd_timer_rate = clk_get_rate(twd_clk); 154 twd_timer_rate = clk_get_rate(twd_clk);
155 155
156 clockevents_update_freq(__this_cpu_ptr(twd_evt), twd_timer_rate); 156 clockevents_update_freq(raw_cpu_ptr(twd_evt), twd_timer_rate);
157} 157}
158 158
159static int twd_cpufreq_transition(struct notifier_block *nb, 159static int twd_cpufreq_transition(struct notifier_block *nb,
@@ -179,7 +179,7 @@ static struct notifier_block twd_cpufreq_nb = {
179 179
180static int twd_cpufreq_init(void) 180static int twd_cpufreq_init(void)
181{ 181{
182 if (twd_evt && __this_cpu_ptr(twd_evt) && !IS_ERR(twd_clk)) 182 if (twd_evt && raw_cpu_ptr(twd_evt) && !IS_ERR(twd_clk))
183 return cpufreq_register_notifier(&twd_cpufreq_nb, 183 return cpufreq_register_notifier(&twd_cpufreq_nb,
184 CPUFREQ_TRANSITION_NOTIFIER); 184 CPUFREQ_TRANSITION_NOTIFIER);
185 185
@@ -269,7 +269,7 @@ static void twd_get_clock(struct device_node *np)
269 */ 269 */
270static void twd_timer_setup(void) 270static void twd_timer_setup(void)
271{ 271{
272 struct clock_event_device *clk = __this_cpu_ptr(twd_evt); 272 struct clock_event_device *clk = raw_cpu_ptr(twd_evt);
273 int cpu = smp_processor_id(); 273 int cpu = smp_processor_id();
274 274
275 /* 275 /*