diff --git a/[refs] b/[refs] index 42af9b086e3a..8b8680961d4e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 828d055fd00fe5cd2186fbb599c6f64e53c6706d +refs/heads/master: c0fe2e6964bea897d059fd1680a53cf131546f20 diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index cfeaf55a24ea..929734386fd9 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -1425,6 +1425,7 @@ and is between 256 and 4096 characters. It is defined in the file Param: - step/bucket size as a power of 2 for statistical time based profiling. Param: "sleep" - profile D-state sleeping (millisecs) + Param: "kvm" - profile VM exits. processor.max_cstate= [HW,ACPI] Limit processor to maximum C-state