diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2005-09-07 00:17:26 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 01:57:29 +0200 |
| commit | 96d0821cacd095e25a39dfff5232a45b63ed18dd (patch) | |
| tree | 76a7f44e4bbc17cbe4a989468add7ffb5c5d6de0 /include/asm-mips/jmr3927 | |
| parent | [PATCH] CHECK_IRQ_PER_CPU() to avoid dead code in __do_IRQ() (diff) | |
| download | linux-96d0821cacd095e25a39dfff5232a45b63ed18dd.tar.xz linux-96d0821cacd095e25a39dfff5232a45b63ed18dd.zip | |
[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>
Diffstat (limited to 'include/asm-mips/jmr3927')
0 files changed, 0 insertions, 0 deletions