aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2026-05-29 14:39:36 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2026-05-29 14:39:36 +0200
commitf02504316b7f211b7c8b4ac753c7b4b43c7e60aa (patch)
tree8050d17dfb18bbcff5101bbcbe74dec4400558ac /Documentation
parentdf488cac6140aa04ae52af9b4507d8f99a3762be (diff)
parent24fc5870808dea4290e9563746cb5f2146043c6c (diff)
downloadlinux-next-history-f02504316b7f211b7c8b4ac753c7b4b43c7e60aa.tar.gz
Merge back earlier cpufreq material for 7.2
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/admin-guide/kernel-parameters.txt4
-rw-r--r--Documentation/admin-guide/pm/cpufreq.rst2
2 files changed, 1 insertions, 5 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 4d0f545fb3ec5..7ab0e58c4aa91 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1669,10 +1669,6 @@ Kernel parameters
very early in the boot process. For early debugging
via a serial port see kgdboc_earlycon instead.
- elanfreq= [X86-32]
- See comment before function elanfreq_setup() in
- arch/x86/kernel/cpu/cpufreq/elanfreq.c.
-
elfcorehdr=[size[KMG]@]offset[KMG] [PPC,SH,X86,S390,EARLY]
Specifies physical address of start of kernel core
image elf header and optionally the size. Generally
diff --git a/Documentation/admin-guide/pm/cpufreq.rst b/Documentation/admin-guide/pm/cpufreq.rst
index dbe6d23a5d671..fdca59c955dcc 100644
--- a/Documentation/admin-guide/pm/cpufreq.rst
+++ b/Documentation/admin-guide/pm/cpufreq.rst
@@ -516,7 +516,7 @@ This governor exposes the following tunables:
of those tasks above 0 and set this attribute to 1.
``sampling_down_factor``
- Temporary multiplier, between 1 (default) and 100 inclusive, to apply to
+ Temporary multiplier, between 1 (default) and 100000 inclusive, to apply to
the ``sampling_rate`` value if the CPU load goes above ``up_threshold``.
This causes the next execution of the governor's worker routine (after