diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-03-08 00:54:04 +0100 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-03-08 00:54:04 +0100 |
commit | f2c1392ff3473a396e4d177ff5ad368b9d6cd211 (patch) | |
tree | 2111e8c1e50e3fa56fc46bd4e80e5a577459e768 /Documentation/admin-guide | |
parent | b16d3d60b112c8cb90ebcd7ae97a5d2207d6f43c (diff) | |
parent | e0f8b8a65a473a8baa439cf865a694bbeb83fe90 (diff) |
Merge tag 'v4.14.170' into 4.14-2.3.x-imx
This is the 4.14.170 stable release
Conflicts:
drivers/net/phy/phy_device.c
drivers/tty/serial/imx.c
include/linux/platform_data/dma-imx-sdma.h
net/wireless/util.c
Diffstat (limited to 'Documentation/admin-guide')
-rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 933465eff40e..7e0a4be3503d 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -1845,6 +1845,12 @@ Built with CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y, the default is off. + kpti= [ARM64] Control page table isolation of user + and kernel address spaces. + Default: enabled on cores which need mitigation. + 0: force disabled + 1: force enabled + kvm.ignore_msrs=[KVM] Ignore guest accesses to unhandled MSRs. Default is 0 (don't ignore, but inject #GP) |