Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ad53110 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-urgent-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip 

* 'x86-urgent-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip:
  x86: Default to vsyscall=native for now
parents 153b19a3 2b666859

Documentation/kernel-parameters.txt

+4 −3
Original line number Original line Diff line number Diff line
@@ -2706,10 +2706,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			functions are at fixed addresses, they make nice

			functions are at fixed addresses, they make nice

			targets for exploits that can control RIP.

			targets for exploits that can control RIP.





			emulate     [default] Vsyscalls turn into traps and are

			emulate     Vsyscalls turn into traps and are emulated

			            emulated reasonably safely.

			            reasonably safely.





			native      Vsyscalls are native syscall instructions.

			native      [default] Vsyscalls are native syscall

			            instructions.

			            This is a little bit faster than trapping

			            This is a little bit faster than trapping

			            and makes a few dynamic recompilers work

			            and makes a few dynamic recompilers work

			            better than they would in emulation mode.

			            better than they would in emulation mode.

arch/x86/kernel/vsyscall_64.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -56,7 +56,7 @@ DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) = 
	.lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),

	.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)

static int __init vsyscall_setup(char *str)

{

{