From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 6 May 2021 00:11:06 +0000 (+1000)
Subject: Merge remote-tracking branch 'rcu/rcu/next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3d169e8271c9e3b649b4d2f0c84884ff79f08ad1;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'rcu/rcu/next'
---

3d169e8271c9e3b649b4d2f0c84884ff79f08ad1
diff --cc lib/Kconfig.debug
index 678c13967580e,344735b8b151d..0a5a70c742e68
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -2571,20 -2513,25 +2571,32 @@@ config TEST_FP
  
  	  If unsure, say N.
  
+ config TEST_CLOCKSOURCE_WATCHDOG
+ 	tristate "Test clocksource watchdog in kernel space"
+ 	depends on CLOCKSOURCE_WATCHDOG
+ 	help
+ 	  Enable this option to create a kernel module that will trigger
+ 	  a test of the clocksource watchdog.  This module may be loaded
+ 	  via modprobe or insmod in which case it will run upon being
+ 	  loaded, or it may be built in, in which case it will run
+ 	  shortly after boot.
+ 
+ 	  If unsure, say N.
+ 
  endif # RUNTIME_TESTING_MENU
  
 +config ARCH_USE_MEMTEST
 +	bool
 +	help
 +	  An architecture should select this when it uses early_memtest()
 +	  during boot process.
 +
  config MEMTEST
  	bool "Memtest"
 +	depends on ARCH_USE_MEMTEST
  	help
  	  This option adds a kernel parameter 'memtest', which allows memtest
 -	  to be set.
 +	  to be set and executed.
  	        memtest=0, mean disabled; -- default
  	        memtest=1, mean do 1 test pattern;
  	        ...