Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaebe0fe authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: use GFP_NOWAIT for post_alloc_hook"

parents f9739340 271d2afe

drivers/soc/qcom/mem-offline.c

+8 −0
Original line number Diff line number Diff line
@@ -118,6 +118,14 @@ static int mem_event_callback(struct notifier_block *self, 
	start_addr = __pfn_to_phys(start);

	end_addr = __pfn_to_phys(end);

	sec_nr = pfn_to_section_nr(start);



	if (sec_nr > end_section_nr || sec_nr < start_section_nr) {

		if (action == MEM_ONLINE || action == MEM_OFFLINE)

			pr_info("mem-offline: %s mem%d, but not our block. Not performing any action\n",

				action == MEM_ONLINE ? "Onlined" : "Offlined",

				sec_nr);

		return NOTIFY_OK;

	}

	switch (action) {

	case MEM_GOING_ONLINE:

		pr_debug("mem-offline: MEM_GOING_ONLINE : start = 0x%lx end = 0x%lx\n",

mm/page_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -8087,7 +8087,7 @@ __offline_isolated_pages(unsigned long start_pfn, unsigned long end_pfn) 
		zone->free_area[order].nr_free--;

		for (i = 0; i < (1 << order); i++)

			SetPageReserved((page+i));

		post_alloc_hook(page, order, GFP_KERNEL);

		post_alloc_hook(page, order, GFP_NOWAIT);

		pfn += (1 << order);

	}

	spin_unlock_irqrestore(&zone->lock, flags);