diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-26 11:15:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-26 11:15:25 -0700 |
| commit | 6c20f6df61ee7b8b562143504cf3e89ae802de87 (patch) | |
| tree | a72a9fccede5d829da51e6d44604c01943700075 /drivers/xen | |
| parent | f944d061f847b0ccf0ebc095b5a6ba9ea9caec4e (diff) | |
| parent | af44a387e743ab7aa39d3fb5e29c0a973cf91bdc (diff) | |
| download | linux-stable-6c20f6df61ee7b8b562143504cf3e89ae802de87.tar.gz linux-stable-6c20f6df61ee7b8b562143504cf3e89ae802de87.tar.bz2 linux-stable-6c20f6df61ee7b8b562143504cf3e89ae802de87.zip | |
Merge tag 'for-linus-5.12b-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
"This contains a small series with a more elegant fix of a problem
which was originally fixed in rc2"
* tag 'for-linus-5.12b-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
Revert "xen: fix p2m size in dom0 for disabled memory hotplug case"
xen/x86: make XEN_BALLOON_MEMORY_HOTPLUG_LIMIT depend on MEMORY_HOTPLUG
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index 41645fe6ad48..ea0efd290c37 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -50,11 +50,11 @@ config XEN_BALLOON_MEMORY_HOTPLUG SUBSYSTEM=="memory", ACTION=="add", RUN+="/bin/sh -c '[ -f /sys$devpath/state ] && echo online > /sys$devpath/state'" -config XEN_BALLOON_MEMORY_HOTPLUG_LIMIT +config XEN_MEMORY_HOTPLUG_LIMIT int "Hotplugged memory limit (in GiB) for a PV guest" default 512 depends on XEN_HAVE_PVMMU - depends on XEN_BALLOON_MEMORY_HOTPLUG + depends on MEMORY_HOTPLUG help Maxmium amount of memory (in GiB) that a PV guest can be expanded to when using memory hotplug. |