x86 fix

GIT PULL Ingo Molnar 1 participant 1 message Oct 13, 2011

Subsystems (2)

Documentation x86

lore

Share & tools

lore

Ingo Molnar

author

2011-10-13 09:02 UTC #0 lore raw

Linus,

Please pull the latest x86-urgent-for-linus git tree from:

git://tesla.tglx.de/git/linux-2.6-tip.git x86-urgent-for-linus

Thanks,

Ingo

------------------>
Adrian Bunk (1):
x86: Default to vsyscall=native for now

 Documentation/kernel-parameters.txt |    7 ++++---
 arch/x86/kernel/vsyscall_64.c       |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

Documentation/kernel-parameters.txt +4 -3

index 854ed5ca..d6e6724 100644
@@ -2706,10 +2706,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 			functions are at fixed addresses, they make nice
 			targets for exploits that can control RIP.
 
-			emulate     [default] Vsyscalls turn into traps and are
-			            emulated reasonably safely.
+			emulate     Vsyscalls turn into traps and are emulated
+			            reasonably safely.
 
-			native      Vsyscalls are native syscall instructions.
+			native      [default] Vsyscalls are native syscall
+			            instructions.
 			            This is a little bit faster than trapping
 			            and makes a few dynamic recompilers work
 			            better than they would in emulation mode.

arch/x86/kernel/vsyscall_64.c +1 -1

index 18ae83d..b56c65de 100644
@@ -56,7 +56,7 @@ DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) =
 	.lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),
 };
 
-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
+static enum { EMULATE, NATIVE, NONE } vsyscall_mode = NATIVE;
 
 static int __init vsyscall_setup(char *str)
 {