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

Commit 7103f16d authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

mm: compaction: make __compact_pgdat() and compact_pgdat() return void 



These functions always return 0.  Formalise this.

Cc: Jason Liu <r64343@freescale.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@redhat.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1998cc04

include/linux/compaction.h

+2 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ extern int fragmentation_index(struct zone *zone, unsigned int order); 
extern unsigned long try_to_compact_pages(struct zonelist *zonelist,

			int order, gfp_t gfp_mask, nodemask_t *mask,

			bool sync, bool *contended);

extern int compact_pgdat(pg_data_t *pgdat, int order);

extern void compact_pgdat(pg_data_t *pgdat, int order);

extern void reset_isolation_suitable(pg_data_t *pgdat);

extern unsigned long compaction_suitable(struct zone *zone, int order);
@@ -80,9 +80,8 @@ static inline unsigned long try_to_compact_pages(struct zonelist *zonelist, 
	return COMPACT_CONTINUE;

}



static inline int compact_pgdat(pg_data_t *pgdat, int order)

static inline void compact_pgdat(pg_data_t *pgdat, int order)

{

	return COMPACT_CONTINUE;

}



static inline void reset_isolation_suitable(pg_data_t *pgdat)

mm/compaction.c

+5 −7
Original line number Diff line number Diff line
@@ -1085,7 +1085,7 @@ unsigned long try_to_compact_pages(struct zonelist *zonelist, 




/* Compact all zones within a node */

static int __compact_pgdat(pg_data_t *pgdat, struct compact_control *cc)

static void __compact_pgdat(pg_data_t *pgdat, struct compact_control *cc)

{

	int zoneid;

	struct zone *zone;
@@ -1118,28 +1118,26 @@ static int __compact_pgdat(pg_data_t *pgdat, struct compact_control *cc) 
		VM_BUG_ON(!list_empty(&cc->freepages));

		VM_BUG_ON(!list_empty(&cc->migratepages));

	}



	return 0;

}



int compact_pgdat(pg_data_t *pgdat, int order)

void compact_pgdat(pg_data_t *pgdat, int order)

{

	struct compact_control cc = {

		.order = order,

		.sync = false,

	};



	return __compact_pgdat(pgdat, &cc);

	__compact_pgdat(pgdat, &cc);

}



static int compact_node(int nid)

static void compact_node(int nid)

{

	struct compact_control cc = {

		.order = -1,

		.sync = true,

	};



	return __compact_pgdat(NODE_DATA(nid), &cc);

	__compact_pgdat(NODE_DATA(nid), &cc);

}



/* Compact all nodes in the system */