Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus

[~andy/linux] / Documentation / cpu-freq / user-guide.txt

diff --git a/Documentation/cpu-freq/user-guide.txt b/Documentation/cpu-freq/user-guide.txt
index 5d5f5fadd1c2c3d278b791735aed625fa39b82f9..04f6b32993e69ca4185a81bbaadb677aac5056e9 100644 (file)
--- a/Documentation/cpu-freq/user-guide.txt
+++ b/Documentation/cpu-freq/user-guide.txt
@@ -176,7 +176,9 @@ scaling_governor,           and by "echoing" the name of another
                                work on some specific architectures or
                                processors.
 
-cpuinfo_cur_freq :             Current speed of the CPU, in KHz.
+cpuinfo_cur_freq :             Current frequency of the CPU as obtained from
+                               the hardware, in KHz. This is the frequency
+                               the CPU actually runs at.
 
 scaling_available_frequencies : List of available frequencies, in KHz.
 
@@ -196,7 +198,21 @@ related_cpus :                     List of CPUs that need some sort of frequency
 
 scaling_driver :               Hardware driver for cpufreq.
 
-scaling_cur_freq :             Current frequency of the CPU, in KHz.
+scaling_cur_freq :             Current frequency of the CPU as determined by
+                               the governor and cpufreq core, in KHz. This is
+                               the frequency the kernel thinks the CPU runs
+                               at.
+
+bios_limit :                   If the BIOS tells the OS to limit a CPU to
+                               lower frequencies, the user can read out the
+                               maximum available frequency from this file.
+                               This typically can happen through (often not
+                               intended) BIOS settings, restrictions
+                               triggered through a service processor or other
+                               BIOS/HW based implementations.
+                               This does not cover thermal ACPI limitations
+                               which can be detected through the generic
+                               thermal driver.
 
 If you have selected the "userspace" governor which allows you to
 set the CPU operating frequency to a specific value, you can read out