Commit 24880bef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'oprofile-removal-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/linux 

Pull oprofile and dcookies removal from Viresh Kumar:
 "Remove oprofile and dcookies support

  The 'oprofile' user-space tools don't use the kernel OPROFILE support
  any more, and haven't in a long time. User-space has been converted to
  the perf interfaces.

  The dcookies stuff is only used by the oprofile code. Now that
  oprofile's support is getting removed from the kernel, there is no
  need for dcookies as well.

  Remove kernel's old oprofile and dcookies support"

* tag 'oprofile-removal-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/linux:
  fs: Remove dcookies support
  drivers: Remove CONFIG_OPROFILE support
  arch: xtensa: Remove CONFIG_OPROFILE support
  arch: x86: Remove CONFIG_OPROFILE support
  arch: sparc: Remove CONFIG_OPROFILE support
  arch: sh: Remove CONFIG_OPROFILE support
  arch: s390: Remove CONFIG_OPROFILE support
  arch: powerpc: Remove oprofile
  arch: powerpc: Stop building and using oprofile
  arch: parisc: Remove CONFIG_OPROFILE support
  arch: mips: Remove CONFIG_OPROFILE support
  arch: microblaze: Remove CONFIG_OPROFILE support
  arch: ia64: Remove rest of perfmon support
  arch: ia64: Remove CONFIG_OPROFILE support
  arch: hexagon: Don't select HAVE_OPROFILE
  arch: arc: Remove CONFIG_OPROFILE support
  arch: arm: Remove CONFIG_OPROFILE support
  arch: alpha: Remove CONFIG_OPROFILE support
parents b52bb135 be65de6b

Documentation/RCU/NMI-RCU.rst

+1 −2
Original line number Diff line number Diff line
@@ -8,8 +8,7 @@ Although RCU is usually used to protect read-mostly data structures, 
it is possible to use RCU to provide dynamic non-maskable interrupt

handlers, as well as dynamic irq handlers.  This document describes

how to do this, drawing loosely from Zwane Mwaikambo's NMI-timer

work in "arch/x86/oprofile/nmi_timer_int.c" and in

"arch/x86/kernel/traps.c".

work in "arch/x86/kernel/traps.c".



The relevant pieces of code are listed below, each followed by a

brief explanation::

Documentation/admin-guide/kernel-parameters.txt

+0 −14
Original line number Diff line number Diff line
@@ -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.

Documentation/kbuild/makefiles.rst

+0 −1
Original line number Diff line number Diff line
@@ -1317,7 +1317,6 @@ When kbuild executes, the following steps are followed (roughly): 
		libs-y                 += arch/sparc/lib/



		drivers-$(CONFIG_PM) += arch/sparc/power/

		drivers-$(CONFIG_OPROFILE)	+= arch/sparc/oprofile/



7.5 Architecture-specific boot images

-------------------------------------

Documentation/process/magic-number.rst

+0 −1
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ FW_HEADER_MAGIC 0x65726F66 fw_header ``drivers/atm/fo 
SLOT_MAGIC            0x67267321       slot                     ``drivers/hotplug/cpqphp.h``

SLOT_MAGIC            0x67267322       slot                     ``drivers/hotplug/acpiphp.h``

LO_MAGIC              0x68797548       nbd_device               ``include/linux/nbd.h``

OPROFILE_MAGIC        0x6f70726f       super_block              ``drivers/oprofile/oprofilefs.h``

M3_STATE_MAGIC        0x734d724d       m3_state                 ``sound/oss/maestro3.c``

VMALLOC_MAGIC         0x87654320       snd_alloc_track          ``sound/core/memory.c``

KMALLOC_MAGIC         0x87654321       snd_alloc_track          ``sound/core/memory.c``

Documentation/translations/it_IT/process/magic-number.rst

+0 −1
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ FW_HEADER_MAGIC 0x65726F66 fw_header ``drivers/atm/fo 
SLOT_MAGIC            0x67267321       slot                     ``drivers/hotplug/cpqphp.h``

SLOT_MAGIC            0x67267322       slot                     ``drivers/hotplug/acpiphp.h``

LO_MAGIC              0x68797548       nbd_device               ``include/linux/nbd.h``

OPROFILE_MAGIC        0x6f70726f       super_block              ``drivers/oprofile/oprofilefs.h``

M3_STATE_MAGIC        0x734d724d       m3_state                 ``sound/oss/maestro3.c``

VMALLOC_MAGIC         0x87654320       snd_alloc_track          ``sound/core/memory.c``

KMALLOC_MAGIC         0x87654321       snd_alloc_track          ``sound/core/memory.c``