Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6962880c authored by Stephen Boyd's avatar Stephen Boyd
Browse files

ARM64: Make KERNEL_TEXT_RDONLY depend on !DEBUG_RODATA 



KERNEL_TEXT_RDONLY is similar to DEBUG_RODATA, but it relies on
4k pages to be made, whereas DEBUG_RODATA can work with or
without 4k pages. Let's move the depends on statement from
FORCE_PAGES to KERNEL_TEXT_RDONLY to accurately reflect the real
dependency here. This fixes a warning where we have FORCE_PAGES
enabled but DEBUG_RODATA is also enabled at the same time because
the latter is "default y" now and the depends on for FORCE_PAGES
can't be satisfied. In fact, it's OK for FORCE_PAGES to be
enabled at the same time as DEBUG_RODATA, it's really there to
prevent KERNEL_TEXT_RDONLY being enabled at the same time as
DEBUG_RODATA. Move the depends on to make things clearer.

Change-Id: Ie73b768ed4540cdb4d752a9b5f1a049bf644bc7e
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent b81d100b

arch/arm64/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ config DEBUG_SET_MODULE_RONX 


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
@@ -105,6 +104,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

arch/arm64/configs/msm_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -671,7 +671,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_NETWORK=y