Andrew, please apply:
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 <[EMAIL PROTECTED]>
---
arch/i386/oprofile/init.c | 12 ++++++------
arch/i386/oprofile/nmi_int.c | 4 ++--
arch/i386/oprofile/nmi_timer_int.c | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
Index: working-2.6/arch/i386/oprofile/nmi_int.c
===================================================================
--- working-2.6.orig/arch/i386/oprofile/nmi_int.c 2005-07-15
15:27:53.000000000 +1000
+++ working-2.6/arch/i386/oprofile/nmi_int.c 2005-08-10 14:28:28.000000000
+1000
@@ -355,7 +355,7 @@
/* in order to get driverfs right */
static int using_nmi;
-int __init nmi_init(struct oprofile_operations *ops)
+int __init op_nmi_init(struct oprofile_operations *ops)
{
__u8 vendor = boot_cpu_data.x86_vendor;
__u8 family = boot_cpu_data.x86;
@@ -420,7 +420,7 @@
}
-void nmi_exit(void)
+void op_nmi_exit(void)
{
if (using_nmi)
exit_driverfs();
Index: working-2.6/arch/i386/oprofile/nmi_timer_int.c
===================================================================
--- working-2.6.orig/arch/i386/oprofile/nmi_timer_int.c 2005-07-15
15:27:53.000000000 +1000
+++ working-2.6/arch/i386/oprofile/nmi_timer_int.c 2005-08-10
14:28:42.000000000 +1000
@@ -40,7 +40,7 @@
}
-int __init nmi_timer_init(struct oprofile_operations * ops)
+int __init op_nmi_timer_init(struct oprofile_operations * ops)
{
extern int nmi_active;
Index: working-2.6/arch/i386/oprofile/init.c
===================================================================
--- working-2.6.orig/arch/i386/oprofile/init.c 2005-07-15 15:27:53.000000000
+1000
+++ working-2.6/arch/i386/oprofile/init.c 2005-08-10 14:28:09.000000000
+1000
@@ -15,9 +15,9 @@
* with the NMI mode driver.
*/
-extern int nmi_init(struct oprofile_operations * ops);
-extern int nmi_timer_init(struct oprofile_operations * ops);
-extern void nmi_exit(void);
+extern int op_nmi_init(struct oprofile_operations * ops);
+extern int op_nmi_timer_init(struct oprofile_operations * ops);
+extern void op_nmi_exit(void);
extern void x86_backtrace(struct pt_regs * const regs, unsigned int depth);
@@ -28,11 +28,11 @@
ret = -ENODEV;
#ifdef CONFIG_X86_LOCAL_APIC
- ret = nmi_init(ops);
+ ret = op_nmi_init(ops);
#endif
#ifdef CONFIG_X86_IO_APIC
if (ret < 0)
- ret = nmi_timer_init(ops);
+ ret = op_nmi_timer_init(ops);
#endif
ops->backtrace = x86_backtrace;
@@ -43,6 +43,6 @@
void oprofile_arch_exit(void)
{
#ifdef CONFIG_X86_LOCAL_APIC
- nmi_exit();
+ op_nmi_exit();
#endif
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
