[alternative-merged] mm-page_allocc-put-is_pageblock_removable_nolock-inside-ifdef.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: mm/page_alloc.c: put is_pageblock_removable_nolock() inside ifdef
has been removed from the -mm tree.  Its filename was
     mm-page_allocc-put-is_pageblock_removable_nolock-inside-ifdef.patch

This patch was dropped because an alternative patch was merged

------------------------------------------------------
From: Mathieu Malaterre <malat@xxxxxxxxxx>
Subject: mm/page_alloc.c: put is_pageblock_removable_nolock() inside ifdef

is_pageblock_removable_nolock() is not used unless CONFIG_MEMORY_HOTREMOVE
is activated.  Move it in between #ifdef sentinel to match prototype in
<linux/memory_hotplug.h>.  Silence gcc warning (W=1):

  mm/page_alloc.c:7704:6: warning: no previous prototype for `is_pageblock_removable_nolock' [-Wmissing-prototypes]

Link: http://lkml.kernel.org/r/20180505201107.21070-1-malat@xxxxxxxxxx
Signed-off-by: Mathieu Malaterre <malat@xxxxxxxxxx>
Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Cc: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx>
Cc: Pavel Tatashin <pasha.tatashin@xxxxxxxxxx>
Cc: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 mm/page_alloc.c |    2 ++
 1 file changed, 2 insertions(+)

diff -puN mm/page_alloc.c~mm-page_allocc-put-is_pageblock_removable_nolock-inside-ifdef mm/page_alloc.c
--- a/mm/page_alloc.c~mm-page_allocc-put-is_pageblock_removable_nolock-inside-ifdef
+++ a/mm/page_alloc.c
@@ -7710,6 +7710,7 @@ bool has_unmovable_pages(struct zone *zo
 	return false;
 }
 
+#ifdef CONFIG_MEMORY_HOTREMOVE
 bool is_pageblock_removable_nolock(struct page *page)
 {
 	struct zone *zone;
@@ -7732,6 +7733,7 @@ bool is_pageblock_removable_nolock(struc
 
 	return !has_unmovable_pages(zone, page, 0, MIGRATE_MOVABLE, true);
 }
+#endif
 
 #if (defined(CONFIG_MEMORY_ISOLATION) && defined(CONFIG_COMPACTION)) || defined(CONFIG_CMA)
 
_

Patches currently in -mm which might be from malat@xxxxxxxxxx are

mm-slubc-add-__printf-verification-to-slab_err.patch
=utf-8qmm-=20move=20function=20=e2=80=98is=5fpagebl=-=utf-8qock=5fremovable=5fnolock=e2=80=99=20to=20mm-memory=5fhotplugc=.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



[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux