[SRU Focal:linux-oracle v2][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:

c25f2bf469b3 ("UBUNTU: [config] oracle: Bring-up for arm64 support")

v2: Add enforcment line to annotations.

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

diff --git a/debian.oracle/config/annotations b/debian.oracle/config/annotations
index a7e59e2ca0f1..df0b9b3d84ee 100644
--- a/debian.oracle/config/annotations
+++ b/debian.oracle/config/annotations
@@ -56,3 +56,7 @@ CONFIG_SERIAL_AMBA_PL011                          policy<{'arm64':'y'}>
 CONFIG_SERIAL_AMBA_PL011                          mark<ENFORCED> note<needed for serial support in VMs>
 CONFIG_SERIAL_AMBA_PL011_CONSOLE                  policy<{'arm64':'y'}>
 CONFIG_SERIAL_AMBA_PL011_CONSOLE                  mark<ENFORCED> note<needed for serial support in VMs>
+
+# Menu: Processor type and features >> Architecture: arm64
+CONFIG_ARM64_SW_TTBR0_PAN                       policy<{'arm64': 'y'}>
+CONFIG_ARM64_SW_TTBR0_PAN 			mark<ENFORCED> note<LP: #1968902>
diff --git a/debian.oracle/config/config.common.ubuntu b/debian.oracle/config/config.common.ubuntu
index 3b5b02f60c11..f76f26f02220 100644
--- a/debian.oracle/config/config.common.ubuntu
+++ b/debian.oracle/config/config.common.ubuntu
@@ -482,7 +482,7 @@ CONFIG_ARM64_RAS_EXTN=y
 # CONFIG_ARM64_RELOC_TEST is not set
 CONFIG_ARM64_SSBD=y
 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_UAO=y
 CONFIG_ARM64_VA_BITS=48
--
2.32.0