git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
i386
/
oprofile
/
nmi_timer_int.c
diff --git
a/arch/i386/oprofile/nmi_timer_int.c
b/arch/i386/oprofile/nmi_timer_int.c
index
c58d0c1
..
930a112
100644
(file)
--- a/
arch/i386/oprofile/nmi_timer_int.c
+++ b/
arch/i386/oprofile/nmi_timer_int.c
@@
-9,7
+9,7
@@
#include <linux/init.h>
#include <linux/smp.h>
#include <linux/init.h>
#include <linux/smp.h>
-#include <linux/
irq
.h>
+#include <linux/
errno
.h>
#include <linux/oprofile.h>
#include <linux/rcupdate.h>
#include <linux/oprofile.h>
#include <linux/rcupdate.h>
@@
-40,7
+40,7
@@
static void timer_stop(void)
}
}
-int __init nmi_timer_init(struct oprofile_operations * ops)
+int __init
op_
nmi_timer_init(struct oprofile_operations * ops)
{
extern int nmi_active;
{
extern int nmi_active;