iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] Fix function/macro name collision on i386 oprofile

Browse Source 
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>
This commit is contained in:
David Gibson 2005-09-06 15:17:26 -07:00 committed by Linus Torvalds
parent f26fdd5992
commit 96d0821cac
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/i386/oprofile/init.c
View File

@ -15,9 +15,9 @@
* with the NMI mode driver.
*/
extern int nmi_init(struct oprofile_operations * ops);
extern int nmi_timer_init(struct oprofile_operations * ops);
extern void nmi_exit(void);
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);
@ -28,11 +28,11 @@ int __init oprofile_arch_init(struct oprofile_operations * ops)
ret = -ENODEV;
#ifdef CONFIG_X86_LOCAL_APIC
ret = nmi_init(ops);
ret = op_nmi_init(ops);
#endif
#ifdef CONFIG_X86_IO_APIC
if (ret < 0)
ret = nmi_timer_init(ops);
ret = op_nmi_timer_init(ops);
#endif
ops->backtrace = x86_backtrace;
@ -43,6 +43,6 @@ int __init oprofile_arch_init(struct oprofile_operations * ops)
void oprofile_arch_exit(void)
{
#ifdef CONFIG_X86_LOCAL_APIC
nmi_exit();
op_nmi_exit();
#endif
}

4
arch/i386/oprofile/nmi_int.c
View File

@ -355,7 +355,7 @@ static int __init ppro_init(char ** cpu_type)
/* in order to get driverfs right */
static int using_nmi;
int __init nmi_init(struct oprofile_operations *ops)
int __init op_nmi_init(struct oprofile_operations *ops)
{
__u8 vendor = boot_cpu_data.x86_vendor;
__u8 family = boot_cpu_data.x86;
@ -420,7 +420,7 @@ int __init nmi_init(struct oprofile_operations *ops)
}
void nmi_exit(void)
void op_nmi_exit(void)
{
if (using_nmi)
exit_driverfs();

2
arch/i386/oprofile/nmi_timer_int.c
View File

@ -40,7 +40,7 @@ static void timer_stop(void)
}
int __init nmi_timer_init(struct oprofile_operations * ops)
int __init op_nmi_timer_init(struct oprofile_operations * ops)
{
extern int nmi_active;