diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2006-01-12 23:39:14 +0100 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2006-01-12 23:39:14 +0100 |
| commit | 8a3652cb7e5d0a67a6bf08bf07efcbc0f4e2c7d6 (patch) | |
| tree | 04f7640ae75fd41d49d6ea2460314a93c7f98289 /xen/arch/x86/nmi.c | |
| parent | 4207635014c977748811f86871444f10819a6b07 (diff) | |
| download | xen-8a3652cb7e5d0a67a6bf08bf07efcbc0f4e2c7d6.tar.gz xen-8a3652cb7e5d0a67a6bf08bf07efcbc0f4e2c7d6.tar.bz2 xen-8a3652cb7e5d0a67a6bf08bf07efcbc0f4e2c7d6.zip | |
Rename ac_timer_* interfaces -> timer_*. The ac_ is
meaningless and unnecessary.
Rename rem_timer -> stop_timer.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'xen/arch/x86/nmi.c')
| -rw-r--r-- | xen/arch/x86/nmi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index b63036ac54..6c969701a3 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -34,7 +34,7 @@ unsigned int nmi_watchdog = NMI_NONE; static unsigned int nmi_hz = HZ; static unsigned int nmi_perfctr_msr; /* the MSR to reset in NMI handler */ static unsigned int nmi_p4_cccr_val; -static struct ac_timer nmi_timer[NR_CPUS]; +static struct timer nmi_timer[NR_CPUS]; static unsigned int nmi_timer_ticks[NR_CPUS]; /* @@ -132,7 +132,7 @@ static void nmi_timer_fn(void *unused) { int cpu = smp_processor_id(); nmi_timer_ticks[cpu]++; - set_ac_timer(&nmi_timer[cpu], NOW() + MILLISECS(1000)); + set_timer(&nmi_timer[cpu], NOW() + MILLISECS(1000)); } static void disable_lapic_nmi_watchdog(void) @@ -345,7 +345,7 @@ void __pminit setup_apic_nmi_watchdog(void) lapic_nmi_owner = LAPIC_NMI_WATCHDOG; nmi_active = 1; - init_ac_timer(&nmi_timer[cpu], nmi_timer_fn, NULL, cpu); + init_timer(&nmi_timer[cpu], nmi_timer_fn, NULL, cpu); } static unsigned int @@ -383,7 +383,7 @@ void watchdog_enable(void) * during setup because the timer infrastructure is not available. */ for_each_online_cpu ( cpu ) - set_ac_timer(&nmi_timer[cpu], NOW()); + set_timer(&nmi_timer[cpu], NOW()); } spin_unlock_irqrestore(&watchdog_lock, flags); |