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 'btrfs-3.0' into for-linus
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
paravirt.c
diff --git
a/arch/x86/kernel/paravirt.c
b/arch/x86/kernel/paravirt.c
index
613a793
..
d90272e
100644
(file)
--- a/
arch/x86/kernel/paravirt.c
+++ b/
arch/x86/kernel/paravirt.c
@@
-307,6
+307,10
@@
struct pv_info pv_info = {
.paravirt_enabled = 0,
.kernel_rpl = 0,
.shared_kernel_pmd = 1, /* Only used when CONFIG_X86_PAE is set */
+
+#ifdef CONFIG_X86_64
+ .extra_user_64bit_cs = __USER_CS,
+#endif
};
struct pv_init_ops pv_init_ops = {