android_kernel_motorola_sm6225/arch/i386/oprofile
David Gibson 96d0821cac [PATCH] Fix function/macro name collision on i386 oprofile
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>
2005-09-07 16:57:29 -07:00
..
backtrace.c [PATCH] xen: x86: Rename usermode macro 2005-06-23 09:45:14 -07:00
init.c [PATCH] Fix function/macro name collision on i386 oprofile 2005-09-07 16:57:29 -07:00
Kconfig Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
nmi_int.c [PATCH] Fix function/macro name collision on i386 oprofile 2005-09-07 16:57:29 -07:00
nmi_timer_int.c [PATCH] Fix function/macro name collision on i386 oprofile 2005-09-07 16:57:29 -07:00
op_counter.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
op_model_athlon.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
op_model_p4.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
op_model_ppro.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
op_x86_model.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00