summaryrefslogtreecommitdiffstats
path: root/Documentation/admin-guide
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2018-12-27 18:05:30 -0800
committerTejun Heo <tj@kernel.org>2018-12-27 18:05:30 -0800
commit4d71c6f8771a6bccb844244f09831fa4624b22c1 (patch)
tree9c6fdf753d64c839a4b0deb7d35d7e990c8e9971 /Documentation/admin-guide
parent1e7eacaf1db2f0f5f62fceda4e6c5a8869f00c13 (diff)
parente9d81a1bc2c48ea9782e3e8b53875f419766ef47 (diff)
downloadlinux-4d71c6f8771a6bccb844244f09831fa4624b22c1.tar.bz2
Merge branch 'for-4.20-fixes' into for-4.21
Diffstat (limited to 'Documentation/admin-guide')
-rw-r--r--Documentation/admin-guide/pm/cpufreq.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/admin-guide/pm/cpufreq.rst b/Documentation/admin-guide/pm/cpufreq.rst
index 47153e64dfb5..7eca9026a9ed 100644
--- a/Documentation/admin-guide/pm/cpufreq.rst
+++ b/Documentation/admin-guide/pm/cpufreq.rst
@@ -150,7 +150,7 @@ data structures necessary to handle the given policy and, possibly, to add
a governor ``sysfs`` interface to it. Next, the governor is started by
invoking its ``->start()`` callback.
-That callback it expected to register per-CPU utilization update callbacks for
+That callback is expected to register per-CPU utilization update callbacks for
all of the online CPUs belonging to the given policy with the CPU scheduler.
The utilization update callbacks will be invoked by the CPU scheduler on
important events, like task enqueue and dequeue, on every iteration of the