tree 76a7f44e4bbc17cbe4a989468add7ffb5c5d6de0
parent f26fdd59929e1144c6caf72adcaf4561d6e682a4
author David Gibson <david@gibson.dropbear.id.au> 1126045046 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1126137449 -0700

[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>