diff options
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 12 | 
1 files changed, 8 insertions, 4 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 60cfc2531f1..7b2e5c5eefa 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1885,6 +1885,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.  			arch_perfmon: [X86] Force use of architectural  				perfmon on Intel CPUs instead of the  				CPU specific event set. +			timer: [X86] Force use of architectural NMI +				timer mode (see also oprofile.timer +				for generic hr timer mode) +				[s390] Force legacy basic mode sampling +                                (report cpu_type "timer")  	oops=panic	Always panic on oopses. Default is to just kill the  			process, but there is a small probability of @@ -2754,11 +2759,10 @@ 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     Vsyscalls turn into traps and are emulated -			            reasonably safely. +			emulate     [default] Vsyscalls turn into traps and are +			            emulated reasonably safely. -			native      [default] Vsyscalls are native syscall -			            instructions. +			native      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.  |