diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-30 13:11:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-30 13:11:26 -0500 |
| commit | c1488798adaf71461c5b679e5b54c2963be5e61c (patch) | |
| tree | 1db7221a16ea0446d73076bfc14a31ba8e53bd31 | |
| parent | 6304672b7f0a5c010002e63a075160856dc4f88d (diff) | |
| parent | 0f7cda2b824bb2afe0d75716a8664117fa03f5e0 (diff) | |
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
| -rw-r--r-- | lib/Kconfig.debug | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 9d5b78aad4c5..2a1f28c183d3 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
| @@ -1952,7 +1952,7 @@ config STRICT_DEVMEM | |||
| 1952 | bool "Filter access to /dev/mem" | 1952 | bool "Filter access to /dev/mem" |
| 1953 | depends on MMU && DEVMEM | 1953 | depends on MMU && DEVMEM |
| 1954 | depends on ARCH_HAS_DEVMEM_IS_ALLOWED | 1954 | depends on ARCH_HAS_DEVMEM_IS_ALLOWED |
| 1955 | default y if TILE || PPC | 1955 | default y if TILE || PPC || X86 || ARM64 |
| 1956 | ---help--- | 1956 | ---help--- |
| 1957 | If this option is disabled, you allow userspace (root) access to all | 1957 | If this option is disabled, you allow userspace (root) access to all |
| 1958 | of memory, including kernel and userspace memory. Accidental | 1958 | of memory, including kernel and userspace memory. Accidental |