lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests 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
Download Patch File Download Diff File Expand all files Collapse all files

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;