aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/memory-hotplug.txt15
1 files changed, 6 insertions, 9 deletions
diff --git a/Documentation/memory-hotplug.txt b/Documentation/memory-hotplug.txt
index f304edb8fbe7..45134dc23854 100644
--- a/Documentation/memory-hotplug.txt
+++ b/Documentation/memory-hotplug.txt
@@ -209,15 +209,12 @@ If memory device is found, memory hotplug code will be called.
209 209
2104.2 Notify memory hot-add event by hand 2104.2 Notify memory hot-add event by hand
211------------ 211------------
212On powerpc, the firmware does not notify a memory hotplug event to the kernel. 212On some architectures, the firmware may not notify the kernel of a memory
213Therefore, "probe" interface is supported to notify the event to the kernel. 213hotplug event. Therefore, the memory "probe" interface is supported to
214This interface depends on CONFIG_ARCH_MEMORY_PROBE. 214explicitly notify the kernel. This interface depends on
215 215CONFIG_ARCH_MEMORY_PROBE and can be configured on powerpc, sh, and x86
216CONFIG_ARCH_MEMORY_PROBE is supported on powerpc only. On x86, this config 216if hotplug is supported, although for x86 this should be handled by ACPI
217option is disabled by default since ACPI notifies a memory hotplug event to 217notification.
218the kernel, which performs its hotplug operation as the result. Please
219enable this option if you need the "probe" interface for testing purposes
220on x86.
221 218
222Probe interface is located at 219Probe interface is located at
223/sys/devices/system/memory/probe 220/sys/devices/system/memory/probe