The patch titled
Subject: mm: vmstat: fix build error when !CONFIG_PROC_FS
has been removed from the -mm tree. Its filename was
mm-vmstatc-fix-cleanup-ifdefs-fix-2.patch
This patch was dropped because it was folded into mm-vmstatc-fix-cleanup-ifdefs.patch
------------------------------------------------------
From: Axel Lin <axel.lin@xxxxxxxxxx>
Subject: mm: vmstat: fix build error when !CONFIG_PROC_FS
Fix build error when CONFIG_DEBUG_FS && CONFIG_COMPACTION && !CONFIG_PROC_FS:
CC mm/vmstat.o
mm/vmstat.c:1607:11: error: 'frag_start' undeclared here (not in a function)
mm/vmstat.c:1608:10: error: 'frag_next' undeclared here (not in a function)
mm/vmstat.c:1609:10: error: 'frag_stop' undeclared here (not in a function)
make[1]: *** [mm/vmstat.o] Error 1
make: *** [mm] Error 2
Signed-off-by: Axel Lin <axel.lin@xxxxxxxxxx>
Cc: Mel Gorman <mel@xxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Tested-by: David Rientjes <rientjes@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/vmstat.c | 48 ++++++++++++++++++++++++------------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff -puN mm/vmstat.c~mm-vmstatc-fix-cleanup-ifdefs-fix-2 mm/vmstat.c
--- a/mm/vmstat.c~mm-vmstatc-fix-cleanup-ifdefs-fix-2
+++ a/mm/vmstat.c
@@ -852,6 +852,30 @@ const char * const vmstat_text[] = {
#if (defined(CONFIG_DEBUG_FS) && defined(CONFIG_COMPACTION)) || \
defined(CONFIG_PROC_FS)
+static void *frag_start(struct seq_file *m, loff_t *pos)
+{
+ pg_data_t *pgdat;
+ loff_t node = *pos;
+
+ for (pgdat = first_online_pgdat();
+ pgdat && node;
+ pgdat = next_online_pgdat(pgdat))
+ --node;
+
+ return pgdat;
+}
+
+static void *frag_next(struct seq_file *m, void *arg, loff_t *pos)
+{
+ pg_data_t *pgdat = (pg_data_t *)arg;
+
+ (*pos)++;
+ return next_online_pgdat(pgdat);
+}
+
+static void frag_stop(struct seq_file *m, void *arg)
+{
+}
/* Walk all the zones in a node and print using a callback */
static void walk_zones_in_node(struct seq_file *m, pg_data_t *pgdat,
@@ -886,30 +910,6 @@ static char * const migratetype_names[MI
#endif
};
-static void *frag_start(struct seq_file *m, loff_t *pos)
-{
- pg_data_t *pgdat;
- loff_t node = *pos;
- for (pgdat = first_online_pgdat();
- pgdat && node;
- pgdat = next_online_pgdat(pgdat))
- --node;
-
- return pgdat;
-}
-
-static void *frag_next(struct seq_file *m, void *arg, loff_t *pos)
-{
- pg_data_t *pgdat = (pg_data_t *)arg;
-
- (*pos)++;
- return next_online_pgdat(pgdat);
-}
-
-static void frag_stop(struct seq_file *m, void *arg)
-{
-}
-
static void frag_show_print(struct seq_file *m, pg_data_t *pgdat,
struct zone *zone)
{
_
Patches currently in -mm which might be from axel.lin@xxxxxxxxxx are
origin.patch
mm-vmstatc-fix-cleanup-ifdefs.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
