[SRU][J][PATCH 2/2] UBUNTU: [Config] Enable CONFIG_PCI_P2PDMA

[Jacob Martin]

BugLink: https://bugs.launchpad.net/bugs/2120209
BugLink: https://bugs.launchpad.net/bugs/1987394

Enable the CONFIG_PCI_P2PDMA configuration so the fix in commit
7ffb791423c7 ("x86/kaslr: Reduce KASLR entropy on most x86 systems") can
take effect.

This config was originally enabled on linux-oem-6.0 to support P2PDMA
use-cases. There does not appear to be any commentary on the original
bug against bringing this back to 5.15.

Signed-off-by: Jacob Martin <jacob.martin at canonical.com>
---
 debian.master/config/annotations | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 1b87bf02c740a..a83ebeebd8732 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -8891,7 +8891,7 @@ CONFIG_PCI_MSI                                  policy<{'amd64': 'y', 'arm64': '
 CONFIG_PCI_MSI_ARCH_FALLBACKS                   policy<{'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_PCI_MSI_IRQ_DOMAIN                       policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_PCI_MVEBU                                policy<{'armhf': 'y'}>
-CONFIG_PCI_P2PDMA                               policy<{'amd64': 'n', 'arm64': 'n', 'ppc64el': 'n'}>
+CONFIG_PCI_P2PDMA                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_PCI_PASID                                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'n'}>
 CONFIG_PCI_PF_STUB                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_PCI_PRI                                  policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'n'}>
-- 
2.43.0