net: explicitly add jump_label.h header to sock.h
authorGlauber Costa <glommer@parallels.com>
Thu, 26 Jan 2012 12:09:28 +0000 (12:09 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 26 Jan 2012 22:13:26 +0000 (17:13 -0500)
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@parallels.com>
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
CC: David S. Miller <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/sock.h

index 4c69ac165e6baad080e659b4cbf91f81e80bdcab..91c1c8baf020d3c5e80df8c3f7eb88323003408f 100644 (file)
@@ -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>