From: Rafael J. Wysocki Date: Thu, 18 Jan 2018 01:55:28 +0000 (+0100) Subject: Merge branches 'acpi-pm' and 'pm-sleep' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bcaea4678f0dc044c34c35ce8ab338106355102f;p=linux.git Merge branches 'acpi-pm' and 'pm-sleep' * acpi-pm: platform/x86: surfacepro3: Support for wakeup from suspend-to-idle ACPI / PM: Use Low Power S0 Idle on more systems ACPI / PM: Make it possible to ignore the system sleep blacklist * pm-sleep: PM / hibernate: Drop unused parameter of enough_swap block, scsi: Fix race between SPI domain validation and system suspend PM / sleep: Make lock/unlock_system_sleep() available to kernel modules PM: hibernate: Do not subtract NR_FILE_MAPPED in minimum_image_size() --- bcaea4678f0dc044c34c35ce8ab338106355102f diff --cc Documentation/admin-guide/kernel-parameters.txt index 46b26bfee27ba,b125690d5dbcd,af7104aaffd92..281c85839c178 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@@@ -3294,21 -3285,6 -3288,12 +3297,21 @@@@ pt. [PARIDE] See Documentation/blockdev/paride.txt. - pti= [X86_64] - Control user/kernel address space isolation: - on - enable - off - disable - auto - default setting ++ pti= [X86_64] Control Page Table Isolation of user and ++ kernel address spaces. Disabling this feature ++ removes hardening, but improves performance of ++ system calls and interrupts. ++ ++ on - unconditionally enable ++ off - unconditionally disable ++ auto - kernel detects whether your CPU model is ++ vulnerable to issues that PTI mitigates ++ ++ Not specifying this option is equivalent to pti=auto. ++ ++ nopti [X86_64] ++ Equivalent to pti=off + pty.legacy_count= [KNL] Number of legacy pty's. Overwrites compiled-in default number.