Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andrew Morton 2013-02-22 16:32:33 -08:00 committed by Linus Torvalds
parent 1998cc0489
commit 7103f16dbf
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/linux/compaction.h
View file

@ -23,7 +23,7 @@ extern int fragmentation_index(struct zone *zone, unsigned int order);
extern unsigned long try_to_compact_pages(struct zonelist *zonelist, extern unsigned long try_to_compact_pages(struct zonelist *zonelist,
int order, gfp_t gfp_mask, nodemask_t *mask, int order, gfp_t gfp_mask, nodemask_t *mask,
bool sync, bool *contended); 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 void reset_isolation_suitable(pg_data_t *pgdat);
extern unsigned long compaction_suitable(struct zone *zone, int order); 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; 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) static inline void reset_isolation_suitable(pg_data_t *pgdat)

12
mm/compaction.c
View file

@ -1085,7 +1085,7 @@ unsigned long try_to_compact_pages(struct zonelist *zonelist,
/* Compact all zones within a node */ /* 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; int zoneid;
struct zone *zone; 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->freepages));
VM_BUG_ON(!list_empty(&cc->migratepages)); 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 = { struct compact_control cc = {
.order = order, .order = order,
.sync = false, .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 = { struct compact_control cc = {
.order = -1, .order = -1,
.sync = true, .sync = true,
}; };
return __compact_pgdat(NODE_DATA(nid), &cc); __compact_pgdat(NODE_DATA(nid), &cc);
} }
/* Compact all nodes in the system */ /* Compact all nodes in the system */