projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into perfcounters/core
[cascardo/linux.git]
/
arch
/
x86
/
kernel
/
cpu
/
perfctr-watchdog.c
diff --git
a/arch/x86/kernel/cpu/perfctr-watchdog.c
b/arch/x86/kernel/cpu/perfctr-watchdog.c
index
9abd48b
..
d6f5b9f
100644
(file)
--- a/
arch/x86/kernel/cpu/perfctr-watchdog.c
+++ b/
arch/x86/kernel/cpu/perfctr-watchdog.c
@@
-20,7
+20,7
@@
#include <linux/kprobes.h>
#include <asm/apic.h>
-#include <asm/
intel_arch_perfmon
.h>
+#include <asm/
perf_counter
.h>
struct nmi_watchdog_ctlblk {
unsigned int cccr_msr;