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>
48 lines
942 B
C
48 lines
942 B
C
/**
|
|
* @file init.c
|
|
*
|
|
* @remark Copyright 2002 OProfile authors
|
|
* @remark Read the file COPYING
|
|
*
|
|
* @author John Levon <levon@movementarian.org>
|
|
*/
|
|
|
|
#include <linux/oprofile.h>
|
|
#include <linux/init.h>
|
|
#include <linux/errno.h>
|
|
|
|
/* We support CPUs that have performance counters like the Pentium Pro
|
|
* with the NMI mode driver.
|
|
*/
|
|
|
|
extern int op_nmi_init(struct oprofile_operations * ops);
|
|
extern int op_nmi_timer_init(struct oprofile_operations * ops);
|
|
extern void op_nmi_exit(void);
|
|
extern void x86_backtrace(struct pt_regs * const regs, unsigned int depth);
|
|
|
|
|
|
int __init oprofile_arch_init(struct oprofile_operations * ops)
|
|
{
|
|
int ret;
|
|
|
|
ret = -ENODEV;
|
|
|
|
#ifdef CONFIG_X86_LOCAL_APIC
|
|
ret = op_nmi_init(ops);
|
|
#endif
|
|
#ifdef CONFIG_X86_IO_APIC
|
|
if (ret < 0)
|
|
ret = op_nmi_timer_init(ops);
|
|
#endif
|
|
ops->backtrace = x86_backtrace;
|
|
|
|
return ret;
|
|
}
|
|
|
|
|
|
void oprofile_arch_exit(void)
|
|
{
|
|
#ifdef CONFIG_X86_LOCAL_APIC
|
|
op_nmi_exit();
|
|
#endif
|
|
}
|