[PATCH] mm: compaction: fix dummy declarations

From	Arnd Bergmann <arnd@arndb.de>
Newsgroups	linux.kernel
Subject	[PATCH] mm: compaction: fix dummy declarations
Date	2016-06-15 23:40 +0200
Message-ID	<rKqHw-7SL-5@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

We get a build error in several test builds after a recent code rework:

In file included from include/linux/balloon_compaction.h:48:0,
                 from mm/balloon_compaction.c:11:
include/linux/compaction.h:237:122: error: 'struct node' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]

The patch that likely introduced the problem added a forward declaration
for 'struct node' in linux/compaction.h, but only in one of two instances.

This moves the declaration out of the #ifdef so we always get it.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: akpm-current ("mm: migrate: support non-lru movable page migration")
---
 include/linux/compaction.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/linux/compaction.h b/include/linux/compaction.h
index c6b47c861cea..8f0297c7e741 100644
--- a/include/linux/compaction.h
+++ b/include/linux/compaction.h
@@ -227,8 +227,9 @@ static inline void wakeup_kcompactd(pg_data_t *pgdat, int order, int classzone_i
 
 #endif /* CONFIG_COMPACTION */
 
-#if defined(CONFIG_COMPACTION) && defined(CONFIG_SYSFS) && defined(CONFIG_NUMA)
 struct node;
+
+#if defined(CONFIG_COMPACTION) && defined(CONFIG_SYSFS) && defined(CONFIG_NUMA)
 extern int compaction_register_node(struct node *node);
 extern void compaction_unregister_node(struct node *node);
 
-- 
2.9.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] mm: compaction: fix dummy declarations Arnd Bergmann <arnd@arndb.de> - 2016-06-15 23:40 +0200
  Re: [PATCH] mm: compaction: fix dummy declarations Andrew Morton <akpm@linux-foundation.org> - 2016-06-15 23:50 +0200
    Re: [PATCH] mm: compaction: fix dummy declarations Minchan Kim <minchan@kernel.org> - 2016-06-16 01:40 +0200
      Re: [PATCH] mm: compaction: fix dummy declarations Andrew Morton <akpm@linux-foundation.org> - 2016-06-17 00:00 +0200

csiph-web