diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2013-02-22 19:32:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-23 20:50:10 -0500 |
commit | 7103f16dbff20fa969c9500902d980d17f953fa6 (patch) | |
tree | 96d9bd87587789d4186df826f430e4fb60e67643 /mm/compaction.c | |
parent | 1998cc048901109a29924380b8e91bc049b32951 (diff) |
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: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/compaction.c')
-rw-r--r-- | mm/compaction.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mm/compaction.c b/mm/compaction.c index 0d0248db36d8..5d5b0b259bc9 100644 --- a/mm/compaction.c +++ b/mm/compaction.c | |||
@@ -1085,7 +1085,7 @@ unsigned long try_to_compact_pages(struct zonelist *zonelist, | |||
1085 | 1085 | ||
1086 | 1086 | ||
1087 | /* Compact all zones within a node */ | 1087 | /* Compact all zones within a node */ |
1088 | static int __compact_pgdat(pg_data_t *pgdat, struct compact_control *cc) | 1088 | static void __compact_pgdat(pg_data_t *pgdat, struct compact_control *cc) |
1089 | { | 1089 | { |
1090 | int zoneid; | 1090 | int zoneid; |
1091 | struct zone *zone; | 1091 | struct zone *zone; |
@@ -1118,28 +1118,26 @@ static int __compact_pgdat(pg_data_t *pgdat, struct compact_control *cc) | |||
1118 | VM_BUG_ON(!list_empty(&cc->freepages)); | 1118 | VM_BUG_ON(!list_empty(&cc->freepages)); |
1119 | VM_BUG_ON(!list_empty(&cc->migratepages)); | 1119 | VM_BUG_ON(!list_empty(&cc->migratepages)); |
1120 | } | 1120 | } |
1121 | |||
1122 | return 0; | ||
1123 | } | 1121 | } |
1124 | 1122 | ||
1125 | int compact_pgdat(pg_data_t *pgdat, int order) | 1123 | void compact_pgdat(pg_data_t *pgdat, int order) |
1126 | { | 1124 | { |
1127 | struct compact_control cc = { | 1125 | struct compact_control cc = { |
1128 | .order = order, | 1126 | .order = order, |
1129 | .sync = false, | 1127 | .sync = false, |
1130 | }; | 1128 | }; |
1131 | 1129 | ||
1132 | return __compact_pgdat(pgdat, &cc); | 1130 | __compact_pgdat(pgdat, &cc); |
1133 | } | 1131 | } |
1134 | 1132 | ||
1135 | static int compact_node(int nid) | 1133 | static void compact_node(int nid) |
1136 | { | 1134 | { |
1137 | struct compact_control cc = { | 1135 | struct compact_control cc = { |
1138 | .order = -1, | 1136 | .order = -1, |
1139 | .sync = true, | 1137 | .sync = true, |
1140 | }; | 1138 | }; |
1141 | 1139 | ||
1142 | return __compact_pgdat(NODE_DATA(nid), &cc); | 1140 | __compact_pgdat(NODE_DATA(nid), &cc); |
1143 | } | 1141 | } |
1144 | 1142 | ||
1145 | /* Compact all nodes in the system */ | 1143 | /* Compact all nodes in the system */ |