git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
include
/
asm
/
segment.h
diff --git
a/arch/x86/include/asm/segment.h
b/arch/x86/include/asm/segment.h
index a314087add072347f4bc4379e4f72eafdb8938cf..ac389292041949facfa43c48802cbe0b51be1e7f 100644
(file)
--- a/
arch/x86/include/asm/segment.h
+++ b/
arch/x86/include/asm/segment.h
@@
-210,7
+210,7
@@
#endif
-#ifndef CONFIG_PARAVIRT
+#ifndef CONFIG_PARAVIRT
_XXL
# define get_kernel_rpl() 0
#endif