[linux-next] LinuxNextTracking branch, master, updated. next-20180201

batman at open-mesh.org batman at open-mesh.org
Fri Feb 2 00:17:02 CET 2018


The following commit has been merged in the master branch:
commit c1488798adaf71461c5b679e5b54c2963be5e61c
Merge: 6304672b7f0a5c010002e63a075160856dc4f88d 0f7cda2b824bb2afe0d75716a8664117fa03f5e0
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date:   Tue Jan 30 10:11:26 2018 -0800

    Merge branch 'core-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
    
    Pull STRICT_DEVMEM default from Ingo Molnar:
     "Make CONFIG_STRICT_DEVMEM default-y on x86 and arm64 as well, to
      follow the distro status quo"
    
    * 'core-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      Kconfig: Make STRICT_DEVMEM default-y on x86 and arm64

diff --combined lib/Kconfig.debug
index 9d5b78aad4c5,39b123d04a36..2a1f28c183d3
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -1099,6 -1099,8 +1099,6 @@@ config PROVE_LOCKIN
  	select DEBUG_MUTEXES
  	select DEBUG_RT_MUTEXES if RT_MUTEXES
  	select DEBUG_LOCK_ALLOC
 -	select LOCKDEP_CROSSRELEASE
 -	select LOCKDEP_COMPLETIONS
  	select TRACE_IRQFLAGS
  	default n
  	help
@@@ -1168,6 -1170,37 +1168,6 @@@ config LOCK_STA
  	 CONFIG_LOCK_STAT defines "contended" and "acquired" lock events.
  	 (CONFIG_LOCKDEP defines "acquire" and "release" events.)
  
 -config LOCKDEP_CROSSRELEASE
 -	bool
 -	help
 -	 This makes lockdep work for crosslock which is a lock allowed to
 -	 be released in a different context from the acquisition context.
 -	 Normally a lock must be released in the context acquiring the lock.
 -	 However, relexing this constraint helps synchronization primitives
 -	 such as page locks or completions can use the lock correctness
 -	 detector, lockdep.
 -
 -config LOCKDEP_COMPLETIONS
 -	bool
 -	help
 -	 A deadlock caused by wait_for_completion() and complete() can be
 -	 detected by lockdep using crossrelease feature.
 -
 -config BOOTPARAM_LOCKDEP_CROSSRELEASE_FULLSTACK
 -	bool "Enable the boot parameter, crossrelease_fullstack"
 -	depends on LOCKDEP_CROSSRELEASE
 -	default n
 -	help
 -	 The lockdep "cross-release" feature needs to record stack traces
 -	 (of calling functions) for all acquisitions, for eventual later
 -	 use during analysis. By default only a single caller is recorded,
 -	 because the unwind operation can be very expensive with deeper
 -	 stack chains.
 -
 -	 However a boot parameter, crossrelease_fullstack, was
 -	 introduced since sometimes deeper traces are required for full
 -	 analysis. This option turns on the boot parameter.
 -
  config DEBUG_LOCKDEP
  	bool "Lock dependency engine debugging"
  	depends on DEBUG_KERNEL && LOCKDEP
@@@ -1952,7 -1985,7 +1952,7 @@@ config STRICT_DEVME
  	bool "Filter access to /dev/mem"
  	depends on MMU && DEVMEM
  	depends on ARCH_HAS_DEVMEM_IS_ALLOWED
- 	default y if TILE || PPC
+ 	default y if TILE || PPC || X86 || ARM64
  	---help---
  	  If this option is disabled, you allow userspace (root) access to all
  	  of memory, including kernel and userspace memory. Accidental

-- 
LinuxNextTracking


More information about the linux-merge mailing list