Merge branch 'core-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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 9d5b78aad4c5bcd59a927c654e8010e54269d750,39b123d04a36d7298a0bba27da39172b4efaa31e..2a1f28c183d3fa474b3dca99ff8c79cafb494174
--- 1/lib/Kconfig.debug
--- 2/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