summaryrefslogtreecommitdiff
authorBaruch Siach <baruch@tkos.co.il>2018-12-14 22:17:03 (GMT)
committer Suren Baghdasaryan <surenb@google.com>2019-03-22 21:14:14 (GMT)
commita8b846a47404f3012f20e018688f26648b1b1f1d (patch)
treef594871d0a07ee19fbd32b55361a9c316c95564b
parentc9f51ce3fa06994944c34d72b4fa2e0d24f697cf (diff)
downloadcommon-a8b846a47404f3012f20e018688f26648b1b1f1d.zip
common-a8b846a47404f3012f20e018688f26648b1b1f1d.tar.gz
common-a8b846a47404f3012f20e018688f26648b1b1f1d.tar.bz2
UPSTREAM: psi: fix reference to kernel commandline enable
The kernel commandline parameter named in CONFIG_PSI_DEFAULT_DISABLED help text contradicts the documentation in kernel-parameters.txt, and the code. Fix that. Link: http://lkml.kernel.org/r/20181203213416.GA12627@cmpxchg.org Fixes: e0c274472d ("psi: make disabling/enabling easier for vendor kernels") Signed-off-by: Baruch Siach <baruch@tkos.co.il> Acked-by: Johannes Weiner <hannes@cmpxchg.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> (cherry picked from commit 428a1cb4baeb9e5c7feda93af7372ba6d2491558) Bug: 111308141 Test: modified lmkd to use PSI and tested using lmkd_unit_test Change-Id: I008b79786ccc6798f0a35f53dd29f4ca013c53a5 Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Diffstat
-rw-r--r--init/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 3ac8b5d..15453541 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -504,8 +504,8 @@ config PSI_DEFAULT_DISABLED
depends on PSI
help
If set, pressure stall information tracking will be disabled
- per default but can be enabled through passing psi_enable=1
- on the kernel commandline during boot.
+ per default but can be enabled through passing psi=1 on the
+ kernel commandline during boot.
endmenu # "CPU/Task time and stats accounting"