From cb08391f332c850ba569b9232c8225ebe0e0758c Mon Sep 17 00:00:00 2001
From: Juergen Gross <jgross@xxxxxxxx>
Date: Wed, 27 Oct 2021 09:05:28 +0200
Subject: [PATCH] x86/xen: update xen.config

Update some entries in xen.config:

- add ACPI as being required for running as dom0
- add SMP for convenience
- add PRINTK and BUG for diagnosis support
- add BLK_DEV_INITRD and BLK_DEV_RAM for initrd support
- remove HIGHMEM64G as this option no longer exists
- remove XEN_MAX_DOMAIN_MEMORY as this option no longer exists

Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
---
 arch/x86/configs/xen.config | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/x86/configs/xen.config b/arch/x86/configs/xen.config
index d9fc7139fd46..8db14cadf5b0 100644
--- a/arch/x86/configs/xen.config
+++ b/arch/x86/configs/xen.config
@@ -1,6 +1,4 @@
 # global x86 required specific stuff
-# On 32-bit HIGHMEM4G is not allowed
-CONFIG_HIGHMEM64G=y
 CONFIG_64BIT=y
 
 # These enable us to allow some of the
@@ -9,12 +7,17 @@ CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PCI=y
 CONFIG_PCI_MSI=y
 CONFIG_X86_MCE=y
+CONFIG_ACPI=y
 CONFIG_ACPI_PROCESSOR=y
 CONFIG_CPU_FREQ=y
+CONFIG_SMP=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_INITRD=y
 
 # x86 xen specific config options
 CONFIG_XEN_PVH=y
-CONFIG_XEN_MAX_DOMAIN_MEMORY=500
 CONFIG_XEN_SAVE_RESTORE=y
 # CONFIG_XEN_DEBUG_FS is not set
 CONFIG_XEN_MCE_LOG=y
-- 
2.26.2