[SRU Impish][linux-oracle][PATCH 1/1] UBUNTU: [config] oracle: Enable CONFIG_ARM64_SW_TTBR0_PAN

[Joseph Salisbury]

BugLink: https://bugs.launchpad.net/bugs/1968902

Re-enable CONFIG_ARM64_SW_TTBR0_PAN which was unintentionally disabled in the
linux-oracle kernels by the following commit:

b077a77337b0 ("UBUNTU: [Config] Oracle: Enable arm64 dependant options")

Signed-off-by: Joseph Salisbury <joseph.salisbury at canonical.com>
---
 debian.oracle/config/annotations          | 2 +-
 debian.oracle/config/config.common.ubuntu | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian.oracle/config/annotations b/debian.oracle/config/annotations
index fbcd8e7f0e7d..eb5a120bc37b 100644
--- a/debian.oracle/config/annotations
+++ b/debian.oracle/config/annotations
@@ -701,7 +701,7 @@ CONFIG_CRYPTO_DEV_SUN8I_CE_HASH                    policy<{'arm64': '-'}>
 CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY                   policy<{'arm64': '-', 'armhf': 'm'}> 
 CONFIG_DRM_I2C_ADV7511_CEC                         policy<{'arm64': 'n', 'armhf': 'y', 'ppc64el': 'y'}> 
 CONFIG_HISI_PMU                                    policy<{'arm64': 'm'}> 
-CONFIG_ARM64_SW_TTBR0_PAN                          policy<{'arm64': 'n'}> 
+CONFIG_ARM64_SW_TTBR0_PAN                          policy<{'arm64': 'y'}> 
 CONFIG_SPI_SPRD_ADI                                policy<{'arm64': '-'}> 
 CONFIG_SUN8I_H3_CCU                                policy<{'arm64': '-'}> 
 CONFIG_RENESAS_WDT                                 policy<{'arm64': '-', 'armhf': 'm'}> 
diff --git a/debian.oracle/config/config.common.ubuntu b/debian.oracle/config/config.common.ubuntu
index 0aa2f42267c2..6c6352b7cfc3 100644
--- a/debian.oracle/config/config.common.ubuntu
+++ b/debian.oracle/config/config.common.ubuntu
@@ -521,7 +521,7 @@ CONFIG_ARM64_PTR_AUTH=y
 CONFIG_ARM64_RAS_EXTN=y
 # CONFIG_ARM64_RELOC_TEST is not set
 CONFIG_ARM64_SVE=y
-# CONFIG_ARM64_SW_TTBR0_PAN is not set
+CONFIG_ARM64_SW_TTBR0_PAN=y
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
 CONFIG_ARM64_TLB_RANGE=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
-- 
2.32.0