The patch titled
Subject: mm-memory-hot-add-memory-can-not-be-added-to-movable-zone-defaultly-fix
has been added to the -mm tree. Its filename is
mm-memory-hot-add-memory-can-not-be-added-to-movable-zone-defaultly-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-memory-hot-add-memory-can-not-be-added-to-movable-zone-defaultly-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-memory-hot-add-memory-can-not-be-added-to-movable-zone-defaultly-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-memory-hot-add-memory-can-not-be-added-to-movable-zone-defaultly-fix
fix comment, fix code layout
Cc: Changsheng Liu <liuchangcheng@xxxxxxxxxx>
Cc: Dave Hansen <dave.hansen@xxxxxxxxx>
Cc: Dongdong Fan <fandd@xxxxxxxxxx>
Cc: Gu Zheng <guz.fnst@xxxxxxxxxxxxxx>
Cc: Hu Tao <hutao@xxxxxxxxxxxxxx>
Cc: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Cc: Tang Chen <tangchen@xxxxxxxxxxxxxx>
Cc: Toshi Kani <toshi.kani@xxxxxx>
Cc: Wang Nan <wangnan0@xxxxxxxxxx>
Cc: Xiaofeng Yan <yanxiaofeng@xxxxxxxxxx>
Cc: Xishi Qiu <qiuxishi@xxxxxxxxxx>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@xxxxxxxxxxxxxx>
Cc: Yinghai Lu <yinghai@xxxxxxxxxx>
Cc: Zhang Yanfei <zhangyanfei@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memory_hotplug.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff -puN mm/memory_hotplug.c~mm-memory-hot-add-memory-can-not-be-added-to-movable-zone-defaultly-fix mm/memory_hotplug.c
--- a/mm/memory_hotplug.c~mm-memory-hot-add-memory-can-not-be-added-to-movable-zone-defaultly-fix
+++ a/mm/memory_hotplug.c
@@ -1201,10 +1201,10 @@ static int check_hotplug_memory_range(u6
/*
* If movable zone has already been setup, newly added memory should be check.
* If its address is higher than movable zone, it should be added as movable.
- * And if system boots up with movable_node and config CONFIG_MOVABLE_NOD and
- * added memory does not overlap the zone before MOVABLE_ZONE,
- * the memory is added as movable
- * Without this check, movable zone may overlap with other zone.
+ * And if system boots up with movable_node and config CONFIG_MOVABLE_NODE and
+ * added memory does not overlap the zone before MOVABLE_ZONE, the memory is
+ * added as movable. Without this check, movable zone may overlap with other
+ * zone.
*/
static int should_add_memory_movable(int nid, u64 start, u64 size)
{
@@ -1213,8 +1213,7 @@ static int should_add_memory_movable(int
struct zone *movable_zone = pgdat->node_zones + ZONE_MOVABLE;
struct zone *pre_zone = pgdat->node_zones + (ZONE_MOVABLE - 1);
- if (movable_node_is_enabled()
- && zone_end_pfn(pre_zone) <= start_pfn)
+ if (movable_node_is_enabled() && zone_end_pfn(pre_zone) <= start_pfn)
return 1;
if (zone_is_empty(movable_zone))
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
mm.patch
uaccess-reimplement-probe_kernel_address-using-probe_kernel_read.patch
uaccess-reimplement-probe_kernel_address-using-probe_kernel_read-fix.patch
mm-memory-hot-add-memory-can-not-be-added-to-movable-zone-defaultly-fix.patch
kasan-various-fixes-in-documentation-checkpatch-fixes.patch
page-flags-introduce-page-flags-policies-wrt-compound-pages-fix.patch
include-linux-page-flagsh-rename-macros-to-avoid-collisions.patch
x86-add-pmd_-for-thp-fix.patch
sparc-add-pmd_-for-thp-fix.patch
mm-support-madvisemadv_free-fix-2.patch
mm-dont-split-thp-page-when-syscall-is-called-fix-3.patch
mm-move-lazy-free-pages-to-inactive-list-fix-fix.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
