[for,4.19-stable,v3,20/24] mm/hotplug: kill is_dev_zone() usage in __remove_pages()

Commit Message

David Hildenbrand Jan. 28, 2020, 9:50 a.m. UTC

From: Dan Williams <[e-mail]>

commit 96da4350000973ef9310a10d077d65bbc017f093 upstream.

-- snip --

Minor conflict, keep the altmap check.

-- snip --

The zone type check was a leftover from the cleanup that plumbed altmap
through the memory hotplug path, i.e.  commit da024512a1fa "mm: pass the
vmem_altmap to arch_remove_memory and __remove_pages".

Link: http://lkml.kernel.org/r/[e-mail]
Signed-off-by: Dan Williams <[e-mail]>
Reviewed-by: David Hildenbrand <[e-mail]>
Reviewed-by: Oscar Salvador <[e-mail]>
Tested-by: Aneesh Kumar K.V <[e-mail]>	[ppc64]
Cc: Michal Hocko <[e-mail]>
Cc: Logan Gunthorpe <[e-mail]>
Cc: Pavel Tatashin <[e-mail]>
Cc: Jane Chu <[e-mail]>
Cc: Jeff Moyer <[e-mail]>
Cc: Jérôme Glisse <[e-mail]>
Cc: Jonathan Corbet <[e-mail]>
Cc: Mike Rapoport <[e-mail]>
Cc: Toshi Kani <[e-mail]>
Cc: Vlastimil Babka <[e-mail]>
Cc: Wei Yang <[e-mail]>
Cc: Jason Gunthorpe <[e-mail]>
Cc: Christoph Hellwig <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
Signed-off-by: Linus Torvalds <[e-mail]>
Signed-off-by: David Hildenbrand <[e-mail]>
---
 mm/memory_hotplug.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

Patch

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 74cfa2fbe88e..888fcbdf97cf 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -507,11 +507,8 @@  void __remove_pages(struct zone *zone, unsigned long phys_start_pfn,
 	unsigned long map_offset = 0;
 	int sections_to_remove;
 
-	/* In the ZONE_DEVICE case device driver owns the memory region */
-	if (is_dev_zone(zone)) {
-		if (altmap)
-			map_offset = vmem_altmap_offset(altmap);
-	}
+	if (altmap)
+		map_offset = vmem_altmap_offset(altmap);
 
 	clear_zone_contiguous(zone);