mirror of
https://github.com/lkl/linux.git
synced 2025-12-19 08:03:01 +09:00
lkl: move KASAN_SHADOW_OFFSET/_SIZE defaults to Kconfig
OUTPUT_FORMAT is known within Kconfig, so we can use the same "elf64-x86-64" specific logic when setting the defaults for CONFIG_KASAN_SHADOW_OFFSET and CONFIG_KASAN_SHADOW_SIZE. The LKL_HOST_CONFIG_KASAN_SHADOW_OFFSET/_SIZE autoconf variables appear to be unused, so drop them for now. If necessary we could put them back in arch/lkl/include/generated/uapi/asm/config.h . Signed-off-by: David Disseldorp <ddiss@suse.de>
This commit is contained in:
@@ -137,11 +137,13 @@ config STACKTRACE_SUPPORT
|
||||
if KASAN
|
||||
config KASAN_SHADOW_OFFSET
|
||||
hex "KASAN shadow offset"
|
||||
default "0"
|
||||
default "0x0000200000000000" if OUTPUT_FORMAT = "elf64-x86-64"
|
||||
default "0" if OUTPUT_FORMAT != "elf64-x86-64"
|
||||
|
||||
config KASAN_SHADOW_SIZE
|
||||
hex "KASAN shadow size"
|
||||
default "0"
|
||||
default "0x0000100000000000" if OUTPUT_FORMAT = "elf64-x86-64"
|
||||
default "0" if OUTPUT_FORMAT != "elf64-x86-64"
|
||||
endif
|
||||
|
||||
config BUILTIN_CMDLINE
|
||||
|
||||
@@ -110,13 +110,6 @@ define nt_host
|
||||
$(if $(filter $(1),pe-x86-64),$(call nt64_host))
|
||||
endef
|
||||
|
||||
define kasan_x86_64
|
||||
$(call set_autoconf_var,KASAN_SHADOW_OFFSET,0x0000200000000000)
|
||||
$(call set_kernel_config,KASAN_SHADOW_OFFSET,0x0000200000000000)
|
||||
$(call set_autoconf_var,KASAN_SHADOW_SIZE,0x0000100000000000)
|
||||
$(call set_kernel_config,KASAN_SHADOW_SIZE,0x0000100000000000)
|
||||
endef
|
||||
|
||||
define kasan_test_enable
|
||||
$(call set_autoconf_var,KASAN_TEST,y)
|
||||
$(call set_kernel_config,KUNIT,y)
|
||||
@@ -127,7 +120,6 @@ endef
|
||||
define kasan_enable
|
||||
$(call set_autoconf_var,KASAN,y)
|
||||
$(call set_kernel_config,KASAN,y)
|
||||
$(if $(filter $(1),elf64-x86-64),$(call kasan_x86_64))
|
||||
$(if $(filter yes,$(kasan_test)), $(call kasan_test_enable))
|
||||
endef
|
||||
|
||||
|
||||
Reference in New Issue
Block a user