2013-10-20 04:26:07

by Hannes Frederic Sowa

Subject: [PATCH net-next] net: fix build warnings because of net_get_random_once merge

This patch fixes the following warning:

In file included from include/linux/skbuff.h:27:0,
from include/linux/netfilter.h:5,
from include/net/netns/netfilter.h:5,
from include/net/net_namespace.h:20,
from include/linux/init_task.h:14,
from init/init_task.c:1:
include/linux/net.h:243:14: warning: 'struct static_key' declared inside parameter list [enabled by default]
struct static_key *done_key);

on x86_64 allnoconfig, um defconfig and ia64 allmodconfig and maybe others as well.

Signed-off-by: Hannes Frederic Sowa <[email protected]>
---
include/linux/net.h | 1 +
1 file changed, 1 insertion(+)

diff --git a/include/linux/net.h b/include/linux/net.h
index a489705..aca446b 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -24,6 +24,7 @@
#include <linux/fcntl.h> /* For O_CLOEXEC and O_NONBLOCK */
#include <linux/kmemcheck.h>
#include <linux/rcupdate.h>
+#include <linux/jump_label.h>
#include <uapi/linux/net.h>

struct poll_table_struct;
--
1.8.3.1

2013-10-21 20:27:32

by David Miller

Subject: Re: [PATCH net-next] net: fix build warnings because of net_get_random_once merge

From: Hannes Frederic Sowa <[email protected]>
Date: Sun, 20 Oct 2013 06:26:02 +0200

> This patch fixes the following warning:
>
> In file included from include/linux/skbuff.h:27:0,
> from include/linux/netfilter.h:5,
> from include/net/netns/netfilter.h:5,
> from include/net/net_namespace.h:20,
> from include/linux/init_task.h:14,
> from init/init_task.c:1:
> include/linux/net.h:243:14: warning: 'struct static_key' declared inside parameter list [enabled by default]
> struct static_key *done_key);
>
> on x86_64 allnoconfig, um defconfig and ia64 allmodconfig and maybe others as well.
>
> Signed-off-by: Hannes Frederic Sowa <[email protected]>

Applied, thanks Hannes.