Skip to contentSkip to conversation

mm: vmstat: Fix build error when !CONFIG_PROC_FS

PATCH In review Axel Lin 2 participants 2 messages Jan 20, 2015 – Jan 21, 2015

Subsystems (2)
Memory management MM core
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 mm/vmstat.c | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)
mm/vmstat.c +24 -24
index 5a47fb1..c95d6b3 100644
@@ -853,6 +853,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,

@@ -887,30 +911,6 @@ static char * const migratetype_names[MIGRATE_TYPES] = {
 #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)
 {
Signature · 9 lines
1.9.1



--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to [email protected].  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Tested-by on v1 1/1
#1 lore raw
Quoted 10 lines · Axel Lin

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 <[email protected]>
Tested-by David Rientjes <[email protected]>

Fixes the build error that I saw with linux-next randconfig, but I'm not sure how sane a debugfs && !procfs config is.

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>