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> |
||
|---|---|---|
| .. | ||
| backtrace.c | ||
| init.c | ||
| Kconfig | ||
| Makefile | ||
| nmi_int.c | ||
| nmi_timer_int.c | ||
| op_counter.h | ||
| op_model_athlon.c | ||
| op_model_p4.c | ||
| op_model_ppro.c | ||
| op_x86_model.h | ||