Merge tag 'core-rcu-2021-02-17' of git://git.kernel.org/pub/scm/linux/kernel/git...

[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 0936f5e..a6c8065 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3458,20 +3458,6 @@
                        For example, to override I2C bus2:
                        omap_mux=i2c2_scl.i2c2_scl=0x100,i2c2_sda.i2c2_sda=0x100
 
-       oprofile.timer= [HW]
-                       Use timer interrupt instead of performance counters
-
-       oprofile.cpu_type=      Force an oprofile cpu type
-                       This might be useful if you have an older oprofile
-                       userland or if you want common events.
-                       Format: { arch_perfmon }
-                       arch_perfmon: [X86] Force use of architectural
-                               perfmon on Intel CPUs instead of the
-                               CPU specific event set.
-                       timer: [X86] Force use of architectural NMI
-                               timer mode (see also oprofile.timer
-                               for generic hr timer mode)
-
        oops=panic      Always panic on oopses. Default is to just kill the
                        process, but there is a small probability of
                        deadlocking the machine.