UBUNTU: [Config] Update configs for rename of XEN_BALLOON_MEMORY_HOTP…

…LUG_LIMIT to XEN_MEMORY_HOTPLUG_LIMIT BugLink: https://bugs.launchpad.net/bugs/1923570 Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
mariux64 · Apr 20, 2021 · 9f65322 · 9f65322
1 parent 27d7da4
commit 9f65322
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/debian.oem/config/annotations b/debian.oem/config/annotations
@@ -10111,7 +10111,7 @@ CONFIG_LG_LAPTOP                                policy<{'amd64': 'm'}>
 # Menu: Device Drivers >> Xen driver support
 CONFIG_XEN_BALLOON                              policy<{'amd64': 'y', 'arm64': 'y'}>
 CONFIG_XEN_BALLOON_MEMORY_HOTPLUG               policy<{'amd64': 'y', 'arm64': 'y'}>
-CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT         policy<{'amd64': '512'}>
+CONFIG_XEN_MEMORY_HOTPLUG_LIMIT                 policy<{'amd64': '512'}>
 CONFIG_XEN_SCRUB_PAGES_DEFAULT                  policy<{'amd64': 'y', 'arm64': 'y'}>
 CONFIG_XEN_DEV_EVTCHN                           policy<{'amd64': 'm', 'arm64': 'm'}>
 CONFIG_XENFS                                    policy<{'amd64': 'm', 'arm64': 'm'}>

diff --git a/debian.oem/config/config.common.ubuntu b/debian.oem/config/config.common.ubuntu
@@ -9126,7 +9126,6 @@ CONFIG_XEN_AUTO_XLATE=y
 CONFIG_XEN_BACKEND=y
 CONFIG_XEN_BALLOON=y
 CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
-CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512
 CONFIG_XEN_BLKDEV_BACKEND=m
 CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_COMPAT_XENFS=y
@@ -9143,6 +9142,7 @@ CONFIG_XEN_GRANT_DMA_ALLOC=y
 CONFIG_XEN_HAVE_PVMMU=y
 CONFIG_XEN_HAVE_VPMU=y
 CONFIG_XEN_MCE_LOG=y
+CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_XEN_NETDEV_FRONTEND=y
 CONFIG_XEN_PCIDEV_BACKEND=m