From 3de5a8021eb8fb0523d06cae916377ff0f177bc4 Mon Sep 17 00:00:00 2001
From: Suren Baghdasaryan <surenb@google.com>
Date: Fri, 17 Jul 2020 09:08:25 -0700
Subject: [PATCH] Revert "ANDROID: GKI: arm64: gki_defconfig: Disable
 CONFIG_ARM64_TAGGED_ADDR_ABI"

This reverts commit 2d21b5d055e221b4910b7c1724b414139410a82a.

Android uses this feature and checks for its presence in
CtsTaggingHostTestCases. Re-enable it.

Bug: 161414875
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I074bc0148e7a4e9d4828717af2d8d9f70f91d36c
---
 arch/arm64/configs/gki_defconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index a715d2dcba9d..885aa0c5ebed 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -50,7 +50,6 @@ CONFIG_SCHED_MC=y
 CONFIG_NR_CPUS=32
 CONFIG_SECCOMP=y
 CONFIG_PARAVIRT=y
-# CONFIG_ARM64_TAGGED_ADDR_ABI is not set
 CONFIG_ARMV8_DEPRECATED=y
 CONFIG_SWP_EMULATION=y
 CONFIG_CP15_BARRIER_EMULATION=y