diff options
author | Mark Brown <broonie@kernel.org> | 2015-01-24 11:54:15 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-01-24 11:54:15 +0000 |
commit | 429421a879dd2d62ac3573ba23d9faac162f5621 (patch) | |
tree | 9eda98c6222bf72739b7b1a3a63a134296986235 /arch/arm64/Makefile | |
parent | 8df8c7d7220e4ea159ca57edbf7f2c6cbf6a7278 (diff) | |
parent | 15f82fce54b86e159fe5a1d41dcdc89e12b26459 (diff) |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-v3.10-android-15.01
Diffstat (limited to 'arch/arm64/Makefile')
-rw-r--r-- | arch/arm64/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 5a4a073745a8..9e64836cb256 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -39,7 +39,11 @@ CHECKFLAGS += -D__aarch64__ head-y := arch/arm64/kernel/head.o # The byte offset of the kernel image in RAM from the start of RAM. +ifeq ($(CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET), y) +TEXT_OFFSET := $(shell awk 'BEGIN {srand(); printf "0x%03x000\n", int(512 * rand())}') +else TEXT_OFFSET := 0x00080000 +endif export TEXT_OFFSET GZFLAGS |