Commit 77b1a7f7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-nonmm-stable-2023-06-24-19-23' of... 

Merge tag 'mm-nonmm-stable-2023-06-24-19-23' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull non-mm updates from Andrew Morton:

 - Arnd Bergmann has fixed a bunch of -Wmissing-prototypes in top-level
   directories

 - Douglas Anderson has added a new "buddy" mode to the hardlockup
   detector. It permits the detector to work on architectures which
   cannot provide the required interrupts, by having CPUs periodically
   perform checks on other CPUs

 - Zhen Lei has enhanced kexec's ability to support two crash regions

 - Petr Mladek has done a lot of cleanup on the hard lockup detector's
   Kconfig entries

 - And the usual bunch of singleton patches in various places

* tag 'mm-nonmm-stable-2023-06-24-19-23' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (72 commits)
  kernel/time/posix-stubs.c: remove duplicated include
  ocfs2: remove redundant assignment to variable bit_off
  watchdog/hardlockup: fix typo in config HARDLOCKUP_DETECTOR_PREFER_BUDDY
  powerpc: move arch_trigger_cpumask_backtrace from nmi.h to irq.h
  devres: show which resource was invalid in __devm_ioremap_resource()
  watchdog/hardlockup: define HARDLOCKUP_DETECTOR_ARCH
  watchdog/sparc64: define HARDLOCKUP_DETECTOR_SPARC64
  watchdog/hardlockup: make HAVE_NMI_WATCHDOG sparc64-specific
  watchdog/hardlockup: declare arch_touch_nmi_watchdog() only in linux/nmi.h
  watchdog/hardlockup: make the config checks more straightforward
  watchdog/hardlockup: sort hardlockup detector related config values a logical way
  watchdog/hardlockup: move SMP barriers from common code to buddy code
  watchdog/buddy: simplify the dependency for HARDLOCKUP_DETECTOR_PREFER_BUDDY
  watchdog/buddy: don't copy the cpumask in watchdog_next_cpu()
  watchdog/buddy: cleanup how watchdog_buddy_check_hardlockup() is called
  watchdog/hardlockup: remove softlockup comment in touch_nmi_watchdog()
  watchdog/hardlockup: in watchdog_hardlockup_check() use cpumask_copy()
  watchdog/hardlockup: don't use raw_cpu_ptr() in watchdog_hardlockup_kick()
  watchdog/hardlockup: HAVE_NMI_WATCHDOG must implement watchdog_hardlockup_probe()
  watchdog/hardlockup: keep kernel.nmi_watchdog sysctl as 0444 if probe fails
  ...
parents 6e17c6de 4afc9a40

arch/Kconfig

+5 −11
Original line number Diff line number Diff line
@@ -426,20 +426,14 @@ config HAVE_HARDLOCKUP_DETECTOR_PERF 
	  The arch chooses to use the generic perf-NMI-based hardlockup

	  detector. Must define HAVE_PERF_EVENTS_NMI.



config HAVE_NMI_WATCHDOG

	depends on HAVE_NMI

	bool

	help

	  The arch provides a low level NMI watchdog. It provides

	  asm/nmi.h, and defines its own arch_touch_nmi_watchdog().



config HAVE_HARDLOCKUP_DETECTOR_ARCH

	bool

	select HAVE_NMI_WATCHDOG

	help

	  The arch chooses to provide its own hardlockup detector, which is

	  a superset of the HAVE_NMI_WATCHDOG. It also conforms to config

	  interfaces and parameters provided by hardlockup detector subsystem.

	  The arch provides its own hardlockup detector implementation instead

	  of the generic ones.



	  It uses the same command line parameters, and sysctl interface,

	  as the generic hardlockup detectors.



config HAVE_PERF_REGS

	bool

arch/arm/include/asm/irq.h

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ struct irqaction; 
struct pt_regs;



void handle_IRQ(unsigned int, struct pt_regs *);

void init_IRQ(void);



#ifdef CONFIG_SMP

#include <linux/cpumask.h>

arch/arm64/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -204,6 +204,8 @@ config ARM64 
	select HAVE_FUNCTION_ERROR_INJECTION

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_GCC_PLUGINS

	select HAVE_HARDLOCKUP_DETECTOR_PERF if PERF_EVENTS && \

		HW_PERF_EVENTS && HAVE_PERF_EVENTS_NMI

	select HAVE_HW_BREAKPOINT if PERF_EVENTS

	select HAVE_IOREMAP_PROT

	select HAVE_IRQ_TIME_ACCOUNTING
@@ -211,6 +213,7 @@ config ARM64 
	select HAVE_MOD_ARCH_SPECIFIC

	select HAVE_NMI

	select HAVE_PERF_EVENTS

	select HAVE_PERF_EVENTS_NMI if ARM64_PSEUDO_NMI

	select HAVE_PERF_REGS

	select HAVE_PERF_USER_STACK_DUMP

	select HAVE_PREEMPT_DYNAMIC_KEY

arch/arm64/include/asm/thread_info.h

+0 −4
Original line number Diff line number Diff line
@@ -55,10 +55,6 @@ struct thread_info { 
void arch_setup_new_exec(void);

#define arch_setup_new_exec     arch_setup_new_exec



void arch_release_task_struct(struct task_struct *tsk);

int arch_dup_task_struct(struct task_struct *dst,

				struct task_struct *src);



#endif



#define TIF_SIGPENDING		0	/* signal pending */

arch/arm64/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ obj-$(CONFIG_KUSER_HELPERS) += kuser32.o 
obj-$(CONFIG_FUNCTION_TRACER)		+= ftrace.o entry-ftrace.o

obj-$(CONFIG_MODULES)			+= module.o module-plts.o

obj-$(CONFIG_PERF_EVENTS)		+= perf_regs.o perf_callchain.o

obj-$(CONFIG_HARDLOCKUP_DETECTOR_PERF)	+= watchdog_hld.o

obj-$(CONFIG_HAVE_HW_BREAKPOINT)	+= hw_breakpoint.o

obj-$(CONFIG_CPU_PM)			+= sleep.o suspend.o

obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o