page-types: add standard GPL license header

[safe/jmp/linux-2.6] / Documentation / memory-hotplug.txt

diff --git a/Documentation/memory-hotplug.txt b/Documentation/memory-hotplug.txt
index 4c2ecf5..57e7e9c 100644 (file)
--- a/Documentation/memory-hotplug.txt
+++ b/Documentation/memory-hotplug.txt
@@ -73,13 +73,13 @@ this phase is triggered automatically. ACPI can notify this event. If not,
 (see Section 4.).
 
 Logical Memory Hotplug phase is to change memory state into
 (see Section 4.).
 
 Logical Memory Hotplug phase is to change memory state into

-avaiable/unavailable for users. Amount of memory from user's view is
+available/unavailable for users. Amount of memory from user's view is

 changed by this phase. The kernel makes all memory in it as free pages
 when a memory range is available.
 
 In this document, this phase is described as online/offline.
 
 changed by this phase. The kernel makes all memory in it as free pages
 when a memory range is available.
 
 In this document, this phase is described as online/offline.
 

-Logical Memory Hotplug phase is triggred by write of sysfs file by system
+Logical Memory Hotplug phase is triggered by write of sysfs file by system

 administrator. For the hot-add case, it must be executed after Physical Hotplug
 phase by hand.
 (However, if you writes udev's hotplug scripts for memory hotplug, these
 administrator. For the hot-add case, it must be executed after Physical Hotplug
 phase by hand.
 (However, if you writes udev's hotplug scripts for memory hotplug, these


@@ -160,12 +160,15 @@ Under each section, you can see 4 files.
 NOTE:
   These directories/files appear after physical memory hotplug phase.
 
 NOTE:
   These directories/files appear after physical memory hotplug phase.
 

-If CONFIG_NUMA is enabled the
-/sys/devices/system/memory/memoryXXX memory section
-directories can also be accessed via symbolic links located in
-the /sys/devices/system/node/node* directories.  For example:
+If CONFIG_NUMA is enabled the memoryXXX/ directories can also be accessed
+via symbolic links located in the /sys/devices/system/node/node* directories.
+
+For example:

 /sys/devices/system/node/node0/memory9 -> ../../memory/memory9
 
 /sys/devices/system/node/node0/memory9 -> ../../memory/memory9
 

+A backlink will also be created:
+/sys/devices/system/memory/memory9/node0 -> ../../node/node0
+

 --------------------------------
 4. Physical memory hot-add phase
 --------------------------------
 --------------------------------
 4. Physical memory hot-add phase
 --------------------------------


@@ -334,7 +337,7 @@ MEMORY_CANCEL_ONLINE
   Generated if MEMORY_GOING_ONLINE fails.
 
 MEMORY_ONLINE
   Generated if MEMORY_GOING_ONLINE fails.
 
 MEMORY_ONLINE

-  Generated when memory has succesfully brought online. The callback may
+  Generated when memory has successfully brought online. The callback may

   allocate pages from the new memory.
 
 MEMORY_GOING_OFFLINE
   allocate pages from the new memory.
 
 MEMORY_GOING_OFFLINE


@@ -359,7 +362,7 @@ The third argument is passed by pointer of struct memory_notify.
 struct memory_notify {
        unsigned long start_pfn;
        unsigned long nr_pages;
 struct memory_notify {
        unsigned long start_pfn;
        unsigned long nr_pages;

-       int status_cahnge_nid;
+       int status_change_nid;

 }
 
 start_pfn is start_pfn of online/offline memory.
 }
 
 start_pfn is start_pfn of online/offline memory.