aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/kernel-parameters.txt7
-rw-r--r--arch/x86/kernel/vsyscall_64.c2
2 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index a0c5c5f4fce6..ce7fc8b3e2c0 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2750,11 +2750,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
2750 functions are at fixed addresses, they make nice 2750 functions are at fixed addresses, they make nice
2751 targets for exploits that can control RIP. 2751 targets for exploits that can control RIP.
2752 2752
2753 emulate Vsyscalls turn into traps and are emulated 2753 emulate [default] Vsyscalls turn into traps and are
2754 reasonably safely. 2754 emulated reasonably safely.
2755 2755
2756 native [default] Vsyscalls are native syscall 2756 native Vsyscalls are native syscall instructions.
2757 instructions.
2758 This is a little bit faster than trapping 2757 This is a little bit faster than trapping
2759 and makes a few dynamic recompilers work 2758 and makes a few dynamic recompilers work
2760 better than they would in emulation mode. 2759 better than they would in emulation mode.
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
index 8084beccd64e..b07ba9393564 100644
--- a/arch/x86/kernel/vsyscall_64.c
+++ b/arch/x86/kernel/vsyscall_64.c
@@ -57,7 +57,7 @@ DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) =
57 .lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock), 57 .lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),
58}; 58};
59 59
60static enum { EMULATE, NATIVE, NONE } vsyscall_mode = NATIVE; 60static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
61 61
62static int __init vsyscall_setup(char *str) 62static int __init vsyscall_setup(char *str)
63{ 63{