diff options
| author | Glauber Costa <glommer@parallels.com> | 2012-01-26 12:09:28 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-26 17:13:26 -0500 |
| commit | 9018e93948c6f8f95fbcc9fa05f6c403d6adb406 (patch) | |
| tree | 491bb99eb3633a54a1d1f03e671ce16c922b6e74 /include | |
| parent | f18da14565819ba43b8321237e2426a2914cc2ef (diff) | |
| download | linux-3.10-9018e93948c6f8f95fbcc9fa05f6c403d6adb406.tar.gz linux-3.10-9018e93948c6f8f95fbcc9fa05f6c403d6adb406.tar.bz2 linux-3.10-9018e93948c6f8f95fbcc9fa05f6c403d6adb406.zip | |
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@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>
Diffstat (limited to 'include')
| -rw-r--r-- | 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 4c69ac165e6..91c1c8baf02 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> |