Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1634938

[PATCH] netfilter: conntrack: Force inlining of build check to prevent build failure

Show all headers | View raw

If gcc (e.g. 4.1.2) decides not to inline total_extension_size(), the
build will fail with:

    net/built-in.o: In function `nf_conntrack_init_start':
    (.text+0x9baf6): undefined reference to `__compiletime_assert_1893'

or

    ERROR: "__compiletime_assert_1893" [net/netfilter/nf_conntrack.ko] undefined!

Fix this by forcing inlining of total_extension_size().

Fixes: b3a5db109e0670d6 ("netfilter: conntrack: use u8 for extension sizes again")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 net/netfilter/nf_conntrack_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index f9245dbfe4356da6..3c8f1ed2f5558fe0 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1853,7 +1853,7 @@ EXPORT_SYMBOL_GPL(nf_conntrack_set_hashsize);
 module_param_call(hashsize, nf_conntrack_set_hashsize, param_get_uint,
 		  &nf_conntrack_htable_size, 0600);
 
-static unsigned int total_extension_size(void)
+static __always_inline unsigned int total_extension_size(void)
 {
 	/* remember to add new extensions below */
 	BUILD_BUG_ON(NF_CT_EXT_NUM > 9);
-- 
2.7.4

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

Thread

[PATCH] netfilter: conntrack: Force inlining of build check to prevent build failure Geert Uytterhoeven <geert@linux-m68k.org> - 2017-05-03 14:20 +0200
  Re: [PATCH] netfilter: conntrack: Force inlining of build check to  prevent build failure Arnd Bergmann <arnd@arndb.de> - 2017-05-03 14:40 +0200
    Re: [PATCH] netfilter: conntrack: Force inlining of build check to  prevent build failure Geert Uytterhoeven <geert@linux-m68k.org> - 2017-05-03 14:50 +0200
      Re: [PATCH] netfilter: conntrack: Force inlining of build check to  prevent build failure Arnd Bergmann <arnd@arndb.de> - 2017-05-03 15:00 +0200
  Re: [PATCH] netfilter: conntrack: Force inlining of build check to  prevent build failure Florian Westphal <fw@strlen.de> - 2017-05-03 14:40 +0200
  Re: [PATCH] netfilter: conntrack: Force inlining of build check to  prevent build failure David Miller <davem@davemloft.net> - 2017-05-03 16:00 +0200
    Re: [PATCH] netfilter: conntrack: Force inlining of build check to  prevent build failure Pablo Neira Ayuso <pablo@netfilter.org> - 2017-05-03 16:20 +0200

csiph-web