projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/paravirt' into x86/apic
[linux-2.6-microblaze.git]
/
arch
/
x86
/
kernel
/
tlb_uv.c
diff --git
a/arch/x86/kernel/tlb_uv.c
b/arch/x86/kernel/tlb_uv.c
index
f4b2f27
..
f396e61
100644
(file)
--- a/
arch/x86/kernel/tlb_uv.c
+++ b/
arch/x86/kernel/tlb_uv.c
@@
-20,7
+20,7
@@
#include <asm/tsc.h>
#include <asm/irq_vectors.h>
-#include <
mach_
apic.h>
+#include <
asm/gen
apic.h>
static struct bau_control **uv_bau_table_bases __read_mostly;
static int uv_bau_retry_limit __read_mostly;