diff options
| author | Will Deacon <willdeacon@google.com> | 2020-06-09 12:55:35 +0100 |
|---|---|---|
| committer | Will Deacon <willdeacon@google.com> | 2020-06-09 12:55:54 +0100 |
| commit | e8c6c2fb4be9d52f6958fef426f911bd7b477a89 (patch) | |
| tree | c0cddb04ce3d04ddb33ff979d224e12d71011289 | |
| parent | 8cc585eb32b429271db6b338b08871350695b56c (diff) | |
Revert "FROMLIST: arm64: reserve x18 from general allocation with SCS"
Shadow call stack is now merged upstream for 5.9, so revert the patches
cherry-picked into android-mainline in preparation for pulling the upstream
version instead.
This reverts commit cb28bf923064492756ec7ee6cb24fd0cec375b86.
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I216e215977ed21e51c228614bb287f1f4ff5efd8
| -rw-r--r-- | arch/arm64/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index e2315f844ba5..85e4149cc5d5 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -79,10 +79,6 @@ branch-prot-flags-$(CONFIG_CC_HAS_BRANCH_PROT_PAC_RET) := -mbranch-protection=pa branch-prot-flags-$(CONFIG_AS_HAS_PAC) += -Wa,-march=armv8.3-a endif -ifeq ($(CONFIG_SHADOW_CALL_STACK), y) -KBUILD_CFLAGS += -ffixed-x18 -endif - KBUILD_CFLAGS += $(branch-prot-flags-y) ifeq ($(CONFIG_CPU_BIG_ENDIAN), y) |