diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-12-19 15:27:21 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-12-19 15:27:21 +0100 |
| commit | 5a213b9220e0bf4c924412d83d7c9a90acb553e8 (patch) | |
| tree | 812347f305cf082e8892ac34eedf51a4979c5636 /Documentation | |
| parent | d8f6ef45a623d650f9b97e11553adb4978f6aa70 (diff) | |
| parent | 63fa47ba886b86cbd58f03b3b01b04bd57a1f233 (diff) | |
| download | lwn-5a213b9220e0bf4c924412d83d7c9a90acb553e8.tar.gz lwn-5a213b9220e0bf4c924412d83d7c9a90acb553e8.zip | |
Merge branch 'topic/ppc-kvm' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux into HEAD
Fix conflicts between memslot overhaul and commit 511d25d6b789f ("KVM:
PPC: Book3S: Suppress warnings when allocating too big memory slots")
from the powerpc tree.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 9725c546a0d4..2711ddb4835a 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -4144,6 +4144,14 @@ Override pmtimer IOPort with a hex value. e.g. pmtmr=0x508 + pmu_override= [PPC] Override the PMU. + This option takes over the PMU facility, so it is no + longer usable by perf. Setting this option starts the + PMU counters by setting MMCR0 to 0 (the FC bit is + cleared). If a number is given, then MMCR1 is set to + that number, otherwise (e.g., 'pmu_override=on'), MMCR1 + remains 0. + pm_debug_messages [SUSPEND,KNL] Enable suspend/resume debug messages during boot up. |