Merge "ARM64: Make KERNEL_TEXT_RDONLY depend on !DEBUG_RODATA"
This commit is contained in:
commit
fb8be73fa6
3 changed files with 1 additions and 3 deletions
|
@ -87,7 +87,6 @@ config DEBUG_ALIGN_RODATA
|
|||
|
||||
config FORCE_PAGES
|
||||
bool "Force lowmem to be mapped with 4K pages"
|
||||
depends on !DEBUG_RODATA
|
||||
help
|
||||
There are some advanced debug features that can only be done when
|
||||
memory is mapped with pages instead of sections. Enable this option
|
||||
|
@ -112,6 +111,7 @@ config FREE_PAGES_RDONLY
|
|||
config KERNEL_TEXT_RDONLY
|
||||
bool "Set kernel text section pages as read only"
|
||||
depends on FREE_PAGES_RDONLY
|
||||
depends on !DEBUG_RODATA
|
||||
help
|
||||
The kernel text pages are always mapped in the kernel.
|
||||
This means that anyone can write to the page if they have
|
||||
|
|
|
@ -638,7 +638,6 @@ CONFIG_PANIC_ON_DATA_CORRUPTION=y
|
|||
CONFIG_ARM64_PTDUMP=y
|
||||
CONFIG_DEBUG_SET_MODULE_RONX=y
|
||||
CONFIG_FREE_PAGES_RDONLY=y
|
||||
CONFIG_KERNEL_TEXT_RDONLY=y
|
||||
CONFIG_CORESIGHT=y
|
||||
CONFIG_CORESIGHT_EVENT=y
|
||||
CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y
|
||||
|
|
|
@ -622,7 +622,6 @@ CONFIG_PANIC_ON_DATA_CORRUPTION=y
|
|||
CONFIG_ARM64_PTDUMP=y
|
||||
CONFIG_DEBUG_SET_MODULE_RONX=y
|
||||
CONFIG_FREE_PAGES_RDONLY=y
|
||||
CONFIG_KERNEL_TEXT_RDONLY=y
|
||||
CONFIG_PFK=y
|
||||
CONFIG_SECURITY=y
|
||||
CONFIG_SECURITY_SELINUX=y
|
||||
|
|
Loading…
Add table
Reference in a new issue