diff options
| author | David S. Miller <davem@davemloft.net> | 2011-10-24 18:18:09 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-24 18:18:09 -0400 |
| commit | 1805b2f04855f07afe3a71d620a68f483b0ed74f (patch) | |
| tree | b823b90f37f5404fcaef70f785c70112ca74a329 /Documentation | |
| parent | 78d81d15b74246c7cedf84894434890b33da3907 (diff) | |
| parent | f42af6c486aa5ca6ee62800cb45c5b252020509d (diff) | |
Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 854ed5ca7e3f..d6e6724446c8 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -2706,10 +2706,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
| 2706 | functions are at fixed addresses, they make nice | 2706 | functions are at fixed addresses, they make nice |
| 2707 | targets for exploits that can control RIP. | 2707 | targets for exploits that can control RIP. |
| 2708 | 2708 | ||
| 2709 | emulate [default] Vsyscalls turn into traps and are | 2709 | emulate Vsyscalls turn into traps and are emulated |
| 2710 | emulated reasonably safely. | 2710 | reasonably safely. |
| 2711 | 2711 | ||
| 2712 | native Vsyscalls are native syscall instructions. | 2712 | native [default] Vsyscalls are native syscall |
| 2713 | instructions. | ||
| 2713 | This is a little bit faster than trapping | 2714 | This is a little bit faster than trapping |
| 2714 | and makes a few dynamic recompilers work | 2715 | and makes a few dynamic recompilers work |
| 2715 | better than they would in emulation mode. | 2716 | better than they would in emulation mode. |