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

Commit 9597e743 authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Will Deacon
Browse files

kasan, arm64: clean up KASAN_SHADOW_SCALE_SHIFT usage 



This is a follow up patch to the series I sent recently that cleans up
KASAN_SHADOW_SCALE_SHIFT usage (which value was hardcoded and scattered
all over the code). This fixes the one place that I forgot to fix.

The change is purely aesthetical, instead of hardcoding the value for
KASAN_SHADOW_SCALE_SHIFT in arch/arm64/Makefile, an appropriate variable
is declared and used.

Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 1f85b42a

arch/arm64/Makefile

+6 −4
Original line number Original line Diff line number Diff line
@@ -97,12 +97,14 @@ else 
TEXT_OFFSET := 0x00080000

TEXT_OFFSET := 0x00080000

endif

endif





# KASAN_SHADOW_OFFSET = VA_START + (1 << (VA_BITS - 3)) - (1 << 61)

# KASAN_SHADOW_OFFSET = VA_START + (1 << (VA_BITS - KASAN_SHADOW_SCALE_SHIFT))

#				 - (1 << (64 - KASAN_SHADOW_SCALE_SHIFT))

# in 32-bit arithmetic

# in 32-bit arithmetic

KASAN_SHADOW_SCALE_SHIFT := 3

KASAN_SHADOW_OFFSET := $(shell printf "0x%08x00000000\n" $$(( \

KASAN_SHADOW_OFFSET := $(shell printf "0x%08x00000000\n" $$(( \

	(0xffffffff & (-1 << ($(CONFIG_ARM64_VA_BITS) - 32))) \

	(0xffffffff & (-1 << ($(CONFIG_ARM64_VA_BITS) - 32))) \

			+ (1 << ($(CONFIG_ARM64_VA_BITS) - 32 - 3)) \

	+ (1 << ($(CONFIG_ARM64_VA_BITS) - 32 - $(KASAN_SHADOW_SCALE_SHIFT))) \

			- (1 << (64 - 32 - 3)) )) )

	- (1 << (64 - 32 - $(KASAN_SHADOW_SCALE_SHIFT))) )) )





export	TEXT_OFFSET GZFLAGS

export	TEXT_OFFSET GZFLAGS