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 'linus' into x86/boot, to resolve conflict
[linux-2.6-microblaze.git]
/
arch
/
x86
/
include
/
asm
/
fsgsbase.h
diff --git
a/arch/x86/include/asm/fsgsbase.h
b/arch/x86/include/asm/fsgsbase.h
index
35cff5f
..
9e7e8ca
100644
(file)
--- a/
arch/x86/include/asm/fsgsbase.h
+++ b/
arch/x86/include/asm/fsgsbase.h
@@
-6,7
+6,7
@@
#ifdef CONFIG_X86_64
-#include <asm/msr
-index
.h>
+#include <asm/msr.h>
/*
* Read/write a task's FSBASE or GSBASE. This returns the value that