git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
[pandora-kernel.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
14d4592
..
d5a2366
100644
(file)
--- a/
arch/x86/kernel/cpu/perfctr-watchdog.c
+++ b/
arch/x86/kernel/cpu/perfctr-watchdog.c
@@
-16,7
+16,7
@@
#include <linux/kernel.h>
#include <linux/bitops.h>
#include <linux/smp.h>
-#include <
linux
/nmi.h>
+#include <
asm
/nmi.h>
#include <linux/kprobes.h>
#include <asm/apic.h>