[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1327615768-13709-1-git-send-email-glommer@parallels.com>
Date: Fri, 27 Jan 2012 02:09:28 +0400
From: Glauber Costa <glommer@...allels.com>
To: davem@...emloft.net
Cc: geert@...ux-m68k.org, netdev@...r.kernel.org, sfr@...b.auug.org.au,
Glauber Costa <glommer@...allels.com>
Subject: [PATCH] net: explicitly add jump_label.h header to sock.h
Commit 36a1211970193ce215de50ed1e4e1272bc814df1 removed linux/module.h
include statement from one of the headers that end up in net/sock.h.
It was providing us with static_branch() definition implicitly, so
after its removal the build got broken.
To fix this, and avoid having this happening in the future,
let me do the right thing and include linux/jump_label.h
explicitly in sock.h.
Signed-off-by: Glauber Costa <glommer@...allels.com>
Reported-by: Randy Dunlap <rdunlap@...otime.net>
CC: David S. Miller <davem@...emloft.net>
---
include/net/sock.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/include/net/sock.h b/include/net/sock.h
index 4c69ac1..91c1c8b 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -55,6 +55,7 @@
#include <linux/uaccess.h>
#include <linux/memcontrol.h>
#include <linux/res_counter.h>
+#include <linux/jump_label.h>
#include <linux/filter.h>
#include <linux/rculist_nulls.h>
--
1.7.7.4
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists