2003-07-10 16:54:33

by John Levon

Subject: [PATCH 1/3] OProfile: __exit fixes

oprofile_arch_exit() can be called from an __init routine now. Remove the remaining
incorrect __exit markers.

diff -Naur -X dontdiff linux-cvs/arch/i386/oprofile/init.c linux-fixes/arch/i386/oprofile/init.c
--- linux-cvs/arch/i386/oprofile/init.c 2003-06-18 15:06:05.000000000 +0100
+++ linux-fixes/arch/i386/oprofile/init.c 2003-06-20 00:19:14.000000000 +0100
@@ -34,7 +34,7 @@
}


-void __exit oprofile_arch_exit(void)
+void oprofile_arch_exit(void)
{
#ifdef CONFIG_X86_LOCAL_APIC
nmi_exit();
diff -Naur -X dontdiff linux-cvs/arch/parisc/oprofile/init.c linux-fixes/arch/parisc/oprofile/init.c
--- linux-cvs/arch/parisc/oprofile/init.c 2003-06-17 15:58:45.000000000 +0100
+++ linux-fixes/arch/parisc/oprofile/init.c 2003-06-20 00:19:24.000000000 +0100
@@ -20,6 +20,6 @@
}


-void __exit oprofile_arch_exit()
+void oprofile_arch_exit()
{
}
diff -Naur -X dontdiff linux-cvs/arch/ppc64/oprofile/init.c linux-fixes/arch/ppc64/oprofile/init.c
--- linux-cvs/arch/ppc64/oprofile/init.c 2003-05-04 02:42:02.000000000 +0100
+++ linux-fixes/arch/ppc64/oprofile/init.c 2003-06-20 00:19:32.000000000 +0100
@@ -19,6 +19,6 @@
}


-void __exit oprofile_arch_exit(void)
+void oprofile_arch_exit(void)
{
}
diff -Naur -X dontdiff linux-cvs/arch/sparc64/oprofile/init.c linux-fixes/arch/sparc64/oprofile/init.c
--- linux-cvs/arch/sparc64/oprofile/init.c 2003-05-04 19:01:46.000000000 +0100
+++ linux-fixes/arch/sparc64/oprofile/init.c 2003-06-20 00:19:40.000000000 +0100
@@ -20,6 +20,6 @@
}


-void __exit oprofile_arch_exit(void)
+void oprofile_arch_exit(void)
{
}

2003-07-10 16:54:28

by John Levon

Subject: [PATCH 3/3] OProfile: fix a comment

Reflect Intel manual bugfix, by Philippe Elie

diff -Naur -X dontdiff linux-cvs/arch/i386/oprofile/op_model_p4.c linux-fixes/arch/i386/oprofile/op_model_p4.c
--- linux-cvs/arch/i386/oprofile/op_model_p4.c 2003-06-15 02:06:38.000000000 +0100
+++ linux-fixes/arch/i386/oprofile/op_model_p4.c 2003-07-10 18:22:51.000000000 +0100
@@ -278,7 +278,7 @@
},

{ /* GLOBAL_POWER_EVENTS */
- 0x06, 0x13 /* manual says 0x05 */,
+ 0x06, 0x13 /* older manual says 0x05, newer 0x13 */,
{ { CTR_BPU_0, MSR_P4_FSB_ESCR0},
{ CTR_BPU_2, MSR_P4_FSB_ESCR1} }
},

2003-07-10 16:56:38

by John Levon

Subject: [PATCH 2/3] OProfile: needed fix to IO-APIC timer

Retransmit of a critical fix to the IO-APIC timer support. By Zwane Mwaikambo. Please apply

diff -Naur -X dontdiff linux-cvs/arch/i386/kernel/nmi.c linux-fixes/arch/i386/kernel/nmi.c
--- linux-cvs/arch/i386/kernel/nmi.c 2003-06-18 15:06:05.000000000 +0100
+++ linux-fixes/arch/i386/kernel/nmi.c 2003-06-18 23:09:49.000000000 +0100
@@ -189,7 +189,6 @@
if ((nmi_watchdog != NMI_IO_APIC) || (nmi_active <= 0))
return;

- disable_irq(0);
unset_nmi_callback();
nmi_active = -1;
nmi_watchdog = NMI_NONE;
@@ -201,7 +200,6 @@
nmi_watchdog = NMI_IO_APIC;
touch_nmi_watchdog();
nmi_active = 1;
- enable_irq(0);
}
}