aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/nmi.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-08-17 02:26:01 -0400
committerDavid S. Miller <davem@davemloft.net>2012-08-19 02:26:18 -0400
commit73a6b0538c131d489fe7a2581deddb72faca496b (patch)
tree3d74b564d96900134d168eff200f802970fb7d70 /arch/sparc/kernel/nmi.c
parent09d053c797f4a559af0647e4283b9b9ec0682d10 (diff)
sparc64: Abstract away the NMI PIC counter computation.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/nmi.c')
-rw-r--r--arch/sparc/kernel/nmi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c
index ef22b9bacf1d..4c45158d4c88 100644
--- a/arch/sparc/kernel/nmi.c
+++ b/arch/sparc/kernel/nmi.c
@@ -125,7 +125,7 @@ notrace __kprobes void perfctr_irq(int irq, struct pt_regs *regs)
125 __this_cpu_write(alert_counter, 0); 125 __this_cpu_write(alert_counter, 0);
126 } 126 }
127 if (__get_cpu_var(wd_enabled)) { 127 if (__get_cpu_var(wd_enabled)) {
128 pcr_ops->write_pic(0, picl_value(nmi_hz)); 128 pcr_ops->write_pic(0, pcr_ops->nmi_picl_value(nmi_hz));
129 pcr_ops->write_pcr(0, pcr_enable); 129 pcr_ops->write_pcr(0, pcr_enable);
130 } 130 }
131 131
@@ -223,7 +223,7 @@ void start_nmi_watchdog(void *unused)
223 atomic_inc(&nmi_active); 223 atomic_inc(&nmi_active);
224 224
225 pcr_ops->write_pcr(0, PCR_PIC_PRIV); 225 pcr_ops->write_pcr(0, PCR_PIC_PRIV);
226 pcr_ops->write_pic(0, picl_value(nmi_hz)); 226 pcr_ops->write_pic(0, pcr_ops->nmi_picl_value(nmi_hz));
227 227
228 pcr_ops->write_pcr(0, pcr_enable); 228 pcr_ops->write_pcr(0, pcr_enable);
229} 229}
@@ -234,7 +234,7 @@ static void nmi_adjust_hz_one(void *unused)
234 return; 234 return;
235 235
236 pcr_ops->write_pcr(0, PCR_PIC_PRIV); 236 pcr_ops->write_pcr(0, PCR_PIC_PRIV);
237 pcr_ops->write_pic(0, picl_value(nmi_hz)); 237 pcr_ops->write_pic(0, pcr_ops->nmi_picl_value(nmi_hz));
238 238
239 pcr_ops->write_pcr(0, pcr_enable); 239 pcr_ops->write_pcr(0, pcr_enable);
240} 240}