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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
i386
/
oprofile
/
op_model_p4.c
diff --git
a/arch/i386/oprofile/op_model_p4.c
b/arch/i386/oprofile/op_model_p4.c
index
ac8a066
..
7c61d35
100644
(file)
--- a/
arch/i386/oprofile/op_model_p4.c
+++ b/
arch/i386/oprofile/op_model_p4.c
@@
-14,6
+14,7
@@
#include <asm/ptrace.h>
#include <asm/fixmap.h>
#include <asm/apic.h>
+#include <asm/nmi.h>
#include "op_x86_model.h"
#include "op_counter.h"