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

Commit 97d5fd27 authored by Sami Tolvanen's avatar Sami Tolvanen
Browse files

mm: fix drain_local_pages function type 



Bug: 67506682
Change-Id: I6ca80f521c880589efe45dc467d494051daae015
Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent 04676269

include/linux/gfp.h

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ extern void __free_page_frag(void *addr); 
void page_alloc_init(void);

void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp);

void drain_all_pages(struct zone *zone);

void drain_local_pages(struct zone *zone);

void drain_local_pages(void *zone);



void page_alloc_init_late(void);

mm/page_alloc.c

+3 −3
Original line number Diff line number Diff line
@@ -2341,8 +2341,9 @@ static void drain_pages(unsigned int cpu) 
 * The CPU has to be pinned. When zone parameter is non-NULL, spill just

 * the single zone's pages.

 */

void drain_local_pages(struct zone *zone)

void drain_local_pages(void *z)

{

	struct zone *zone = (struct zone *)z;

	int cpu = smp_processor_id();



	if (zone)
@@ -2402,8 +2403,7 @@ void drain_all_pages(struct zone *zone) 
		else

			cpumask_clear_cpu(cpu, &cpus_with_pcps);

	}

	on_each_cpu_mask(&cpus_with_pcps, (smp_call_func_t) drain_local_pages,

								zone, 1);

	on_each_cpu_mask(&cpus_with_pcps, drain_local_pages, zone, 1);

}



#ifdef CONFIG_HIBERNATION