Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 79a4dcefd3256896416f5a94d2d1442a7f5aa9b8

Authored by Tang Chen
Committed by Linus Torvalds
1 parent 7179e7bf45
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

mm/memory_hotplug.c: improve comments 

Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 12 additions and 6 deletions Side-by-side Diff

... ... @@ -590,18 +590,21 @@
590 590 }
591 591  
592 592 #ifdef CONFIG_MOVABLE_NODE
593   -/* when CONFIG_MOVABLE_NODE, we allow online node don't have normal memory */
  593 +/*
  594 + * When CONFIG_MOVABLE_NODE, we permit onlining of a node which doesn't have
  595 + * normal memory.
  596 + */
594 597 static bool can_online_high_movable(struct zone *zone)
595 598 {
596 599 return true;
597 600 }
598   -#else /* #ifdef CONFIG_MOVABLE_NODE */
  601 +#else /* CONFIG_MOVABLE_NODE */
599 602 /* ensure every online node has NORMAL memory */
600 603 static bool can_online_high_movable(struct zone *zone)
601 604 {
602 605 return node_state(zone_to_nid(zone), N_NORMAL_MEMORY);
603 606 }
604   -#endif /* #ifdef CONFIG_MOVABLE_NODE */
  607 +#endif /* CONFIG_MOVABLE_NODE */
605 608  
606 609 /* check which state of node_states will be changed when online memory */
607 610 static void node_states_check_changes_online(unsigned long nr_pages,
608 611  
... ... @@ -1112,12 +1115,15 @@
1112 1115 }
1113 1116  
1114 1117 #ifdef CONFIG_MOVABLE_NODE
1115   -/* when CONFIG_MOVABLE_NODE, we allow online node don't have normal memory */
  1118 +/*
  1119 + * When CONFIG_MOVABLE_NODE, we permit offlining of a node which doesn't have
  1120 + * normal memory.
  1121 + */
1116 1122 static bool can_offline_normal(struct zone *zone, unsigned long nr_pages)
1117 1123 {
1118 1124 return true;
1119 1125 }
1120   -#else /* #ifdef CONFIG_MOVABLE_NODE */
  1126 +#else /* CONFIG_MOVABLE_NODE */
1121 1127 /* ensure the node has NORMAL memory if it is still online */
1122 1128 static bool can_offline_normal(struct zone *zone, unsigned long nr_pages)
1123 1129 {
... ... @@ -1141,7 +1147,7 @@
1141 1147 */
1142 1148 return present_pages == 0;
1143 1149 }
1144   -#endif /* #ifdef CONFIG_MOVABLE_NODE */
  1150 +#endif /* CONFIG_MOVABLE_NODE */
1145 1151  
1146 1152 /* check which state of node_states will be changed when offline memory */
1147 1153 static void node_states_check_changes_offline(unsigned long nr_pages,