diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 18:31:30 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 18:31:30 +0400 |
| commit | f18651eb2c7ac13b9dd0e3b357d07e1d4cd8e00d (patch) | |
| tree | f451e22f54d6f7a3d85bbed929750ee2a84d7dbb /include/net/net_namespace.h | |
| parent | b8ba3874b4cf43ef1970cb3fe664a28d621ea197 (diff) | |
| parent | 77319669af37a1cfc844b801e83343b37e3c7e13 (diff) | |
| download | linux-f18651eb2c7ac13b9dd0e3b357d07e1d4cd8e00d.tar.xz | |
Merge tag 'omap-for-v3.15/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical
Merge "omap fixes for v3.15 merge window" from Tony Lindgren:
Fixes for omaps that would be good to get in before v3.15-rc1.
* tag 'omap-for-v3.15/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP4: hwmod data: correct the idlemodes for spinlock
ARM: dts: am33xx: correcting dt node unit address for usb
ARM: dts: omap4/5: Use l3_ick for the gpmc node
CLK: TI: OMAP4/5/DRA7: Remove gpmc_fck from dummy clocks
ARM: OMAP4: Fix definition of IS_PM44XX_ERRATUM
ARM: OMAP2+: INTC: Acknowledge stuck active interrupts
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/net/net_namespace.h')
| -rw-r--r-- | include/net/net_namespace.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index da68c9a90ac5..991dcd94cbbf 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -162,6 +162,14 @@ extern struct list_head net_namespace_list; struct net *get_net_ns_by_pid(pid_t pid); struct net *get_net_ns_by_fd(int pid); +#ifdef CONFIG_SYSCTL +void ipx_register_sysctl(void); +void ipx_unregister_sysctl(void); +#else +#define ipx_register_sysctl() +#define ipx_unregister_sysctl() +#endif + #ifdef CONFIG_NET_NS void __put_net(struct net *net); |