linux/arch
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
..
alpha [PATCH] convert signal handling of NODEFER to act like other Unix boxes. 2005-08-29 10:03:11 -07:00
arm [ARM] 2882/1: pxa2xx_sharpsl: Update PCMCIA driver to support variety of new hardware 2005-09-05 20:49:54 +01:00
arm26 [PATCH] convert signal handling of NODEFER to act like other Unix boxes. 2005-08-29 10:03:11 -07:00
cris [PATCH] arch/cris/Kconfig.debug: use lib/Kconfig.debug 2005-09-05 00:06:19 -07:00
frv [PATCH] frv: Remove export of strtok() 2005-09-05 00:06:01 -07:00
h8300 [PATCH] convert signal handling of NODEFER to act like other Unix boxes. 2005-08-29 10:03:11 -07:00
i386 [PATCH] Fix function/macro name collision on i386 oprofile 2005-09-07 16:57:29 -07:00
ia64 [PATCH] x86/x86_64: deferred handling of writes to /proc/irqxx/smp_affinity 2005-09-07 16:57:15 -07:00
m32r [PATCH] convert signal handling of NODEFER to act like other Unix boxes. 2005-08-29 10:03:11 -07:00
m68k [PATCH] move m68k rtc drivers over to initcalls 2005-09-07 16:57:23 -07:00
m68knommu Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild 2005-09-06 00:35:51 -07:00
mips [PATCH] compat: be more consistent about [ug]id_t 2005-09-07 16:57:19 -07:00
parisc [PATCH] convert signal handling of NODEFER to act like other Unix boxes. 2005-08-29 10:03:11 -07:00
ppc [PATCH] ppc32: fix ocp_device_suspend to use pm_message_t instead of u32 2005-09-07 16:57:15 -07:00
ppc64 [PATCH] remove linux/version.h include from arch/ppc64 2005-09-06 16:57:46 +10:00
s390 [PATCH] s390: compat system calls 2005-09-05 00:06:29 -07:00
sh [PATCH] convert signal handling of NODEFER to act like other Unix boxes. 2005-08-29 10:03:11 -07:00
sh64 [PATCH] arch/sh64/Kconfig: doesn't need it's own LOG_BUF_SHIFT 2005-09-05 00:06:09 -07:00
sparc [SPARC]: Kill io_remap_page_range() 2005-09-01 21:51:26 -07:00
sparc64 [SPARC64]: Don't include drivers/firmware/Kconfig 2005-09-05 23:34:13 -07:00
um [PATCH] uml: fix x86_64 page leak 2005-09-05 00:06:24 -07:00
v850 [PATCH] v850: Add show_mem 2005-09-02 00:57:31 -07:00
x86_64 [PATCH] Make the bzImage format self-terminating 2005-09-07 16:57:29 -07:00
xtensa [PATCH] convert signal handling of NODEFER to act like other Unix boxes. 2005-08-29 10:03:11 -07:00