96d0821cac
The i386 OProfile code has a function named nmi_exit(), which collides with the nmi_exit() macro in linux/hardirq.h. At the moment, we get away with it, because hardirq.h isn't included in the oprofile code. I hit this as a bug when working with a patch which (indirectly) adds a #include of hardirq.h to oprofile. Regardless, the name collision is probably not a good idea, so this patch fixes it, renaming the oprofile function to op_nmi_exit(). It also renames the nmi_init() and nmi_timer_init() functions similarly, for consistency. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
56 lines
1.0 KiB
C
56 lines
1.0 KiB
C
/**
|
|
* @file nmi_timer_int.c
|
|
*
|
|
* @remark Copyright 2003 OProfile authors
|
|
* @remark Read the file COPYING
|
|
*
|
|
* @author Zwane Mwaikambo <zwane@linuxpower.ca>
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/oprofile.h>
|
|
#include <linux/rcupdate.h>
|
|
|
|
|
|
#include <asm/nmi.h>
|
|
#include <asm/apic.h>
|
|
#include <asm/ptrace.h>
|
|
|
|
static int nmi_timer_callback(struct pt_regs * regs, int cpu)
|
|
{
|
|
oprofile_add_sample(regs, 0);
|
|
return 1;
|
|
}
|
|
|
|
static int timer_start(void)
|
|
{
|
|
disable_timer_nmi_watchdog();
|
|
set_nmi_callback(nmi_timer_callback);
|
|
return 0;
|
|
}
|
|
|
|
|
|
static void timer_stop(void)
|
|
{
|
|
enable_timer_nmi_watchdog();
|
|
unset_nmi_callback();
|
|
synchronize_sched(); /* Allow already-started NMIs to complete. */
|
|
}
|
|
|
|
|
|
int __init op_nmi_timer_init(struct oprofile_operations * ops)
|
|
{
|
|
extern int nmi_active;
|
|
|
|
if (nmi_active <= 0)
|
|
return -ENODEV;
|
|
|
|
ops->start = timer_start;
|
|
ops->stop = timer_stop;
|
|
ops->cpu_type = "timer";
|
|
printk(KERN_INFO "oprofile: using NMI timer interrupt.\n");
|
|
return 0;
|
|
}
|