Merge branch 'kvm-pi-raw-spinlock' into HEAD

[linux-2.6-microblaze.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 2fba824..86a2456 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -4150,6 +4150,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.