---

yaml --- r: 356931 b: refs/heads/master c: ef92e7c h: refs/heads/master i: 356929: 3fda2f3 356927: f9f9290 v: v3
git-mirror · Feb 20, 2013 · b66c46c · b66c46c
1 parent 1a8fd30
commit b66c46c
Show file tree

Hide file tree

Showing 5 changed files with 523 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcb93b96cec723783a81e8cac7df62feaf964792
+refs/heads/master: ef92e7caf9901884f19fdeb4d7a24333b33c5f37
diff --git a/trunk/drivers/xen/Kconfig b/trunk/drivers/xen/Kconfig
@@ -191,6 +191,17 @@ config XEN_STUB
 
 	  To enable Xen features like cpu and memory hotplug, select Y here.
 
+config XEN_ACPI_HOTPLUG_MEMORY
+	tristate "Xen ACPI memory hotplug"
+	depends on XEN_DOM0 && XEN_STUB && ACPI
+	default n
+	help
+	  This is Xen ACPI memory hotplug.
+
+	  Currently Xen only support ACPI memory hot-add. If you want
+	  to hot-add memory at runtime (the hot-added memory cannot be
+	  removed until machine stop), select Y/M here, otherwise select N.
+
 config XEN_ACPI_PROCESSOR
 	tristate "Xen ACPI processor"
 	depends on XEN && X86 && ACPI_PROCESSOR && CPU_FREQ

diff --git a/trunk/drivers/xen/Makefile b/trunk/drivers/xen/Makefile
@@ -31,6 +31,7 @@ obj-$(CONFIG_XEN_MCE_LOG)		+= mcelog.o
 obj-$(CONFIG_XEN_PCIDEV_BACKEND)	+= xen-pciback/
 obj-$(CONFIG_XEN_PRIVCMD)		+= xen-privcmd.o
 obj-$(CONFIG_XEN_STUB)			+= xen-stub.o
+obj-$(CONFIG_XEN_ACPI_HOTPLUG_MEMORY)	+= xen-acpi-memhotplug.o
 obj-$(CONFIG_XEN_ACPI_PROCESSOR)	+= xen-acpi-processor.o
 xen-evtchn-y				:= evtchn.o
 xen-gntdev-y				:= gntdev.o