Merge tag 'docs-4.15-2' of git://git.lwn.net/linux

[sfrench/cifs-2.6.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 62436bd5f34a730b5e0c15e38138970605d9f8c0..b44217290e5776ee616437bf8f1b86be93adac0a 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3246,13 +3246,15 @@
                        instead using the legacy FADT method
 
        profile=        [KNL] Enable kernel profiling via /proc/profile
                        instead using the legacy FADT method
 
        profile=        [KNL] Enable kernel profiling via /proc/profile

-                       Format: [schedule,]<number>
+                       Format: [<profiletype>,]<number>
+                       Param: <profiletype>: "schedule", "sleep", or "kvm"
+                               [defaults to kernel profiling]

                        Param: "schedule" - profile schedule points.
                        Param: "schedule" - profile schedule points.

-                       Param: <number> - step/bucket size as a power of 2 for
-                               statistical time based profiling.

                        Param: "sleep" - profile D-state sleeping (millisecs).
                                Requires CONFIG_SCHEDSTATS
                        Param: "kvm" - profile VM exits.
                        Param: "sleep" - profile D-state sleeping (millisecs).
                                Requires CONFIG_SCHEDSTATS
                        Param: "kvm" - profile VM exits.

+                       Param: <number> - step/bucket size as a power of 2 for
+                               statistical time based profiling.

 
        prompt_ramdisk= [RAM] List of RAM disks to prompt for floppy disk
                        before loading.
 
        prompt_ramdisk= [RAM] List of RAM disks to prompt for floppy disk
                        before loading.