[folded-merged] mm-page_allocc-memory_hotplug-free-pages-as-higher-order-v11.patch removed from -mm tree

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

 



The patch titled
     Subject: mm-page_allocc-memory_hotplug-free-pages-as-higher-order-v11
has been removed from the -mm tree.  Its filename was
     mm-page_allocc-memory_hotplug-free-pages-as-higher-order-v11.patch

This patch was dropped because it was folded into memory_hotplug-free-pages-as-higher-order.patch

------------------------------------------------------
From: Arun KS <arunks@xxxxxxxxxxxxxx>
Subject: mm-page_allocc-memory_hotplug-free-pages-as-higher-order-v11

fix condition check in hv_ballon driver, fix check page belong to HAS in
hv_ballon.c

[akpm@xxxxxxxxxxxxxxxxxxxx: remove unused local, per Arun]
Link: http://lkml.kernel.org/r/1547792588-18032-1-git-send-email-arunks@xxxxxxxxxxxxxx
Signed-off-by: Arun KS <arunks@xxxxxxxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
Reviewed-by: Oscar Salvador <osalvador@xxxxxxx>
Reviewed-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/hv/hv_balloon.c |    5 +++--
 mm/memory_hotplug.c     |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

--- a/drivers/hv/hv_balloon.c~mm-page_allocc-memory_hotplug-free-pages-as-higher-order-v11
+++ a/drivers/hv/hv_balloon.c
@@ -780,10 +780,11 @@ static void hv_online_page(struct page *
 	spin_lock_irqsave(&dm_device.ha_lock, flags);
 	list_for_each_entry(has, &dm_device.ha_region_list, list) {
 		/* The page belongs to a different HAS. */
-		if ((pfn < has->start_pfn) || (pfn >= has->end_pfn))
+		if ((pfn < has->start_pfn) ||
+				(pfn + (1UL << order) > has->end_pfn))
 			continue;
 
-		hv_bring_pgs_online(has, pfn, (1UL << order));
+		hv_bring_pgs_online(has, pfn, 1UL << order);
 		break;
 	}
 	spin_unlock_irqrestore(&dm_device.ha_lock, flags);
--- a/mm/memory_hotplug.c~mm-page_allocc-memory_hotplug-free-pages-as-higher-order-v11
+++ a/mm/memory_hotplug.c
@@ -669,7 +669,7 @@ static void generic_online_page(struct p
 static int online_pages_blocks(unsigned long start, unsigned long nr_pages)
 {
 	unsigned long end = start + nr_pages;
-	int order, ret, onlined_pages = 0;
+	int order, onlined_pages = 0;
 
 	while (start < end) {
 		order = min(MAX_ORDER - 1,
_

Patches currently in -mm which might be from arunks@xxxxxxxxxxxxxx are

memory_hotplug-free-pages-as-higher-order.patch




[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