diff options
| author | David S. Miller <davem@davemloft.net> | 2017-05-18 16:11:32 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-18 16:11:32 -0400 |
| commit | c6cd850d6568872f66fc4a4582f34f9b910066ca (patch) | |
| tree | e9a6370f7b0ce110e2916a6288a8fb0ee8323e37 /net/x25/sysctl_net_x25.c | |
| parent | 27902f08065ba61514c331b7d6e85635c1655d82 (diff) | |
| parent | 8b4822de59d5d9919b9b045183a36c673ce20b73 (diff) | |
| download | blackbird-obmc-linux-c6cd850d6568872f66fc4a4582f34f9b910066ca.tar.gz blackbird-obmc-linux-c6cd850d6568872f66fc4a4582f34f9b910066ca.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/x25/sysctl_net_x25.c')
| -rw-r--r-- | net/x25/sysctl_net_x25.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c index a06dfe143c67..ba078c85f0a1 100644 --- a/net/x25/sysctl_net_x25.c +++ b/net/x25/sysctl_net_x25.c @@ -73,9 +73,12 @@ static struct ctl_table x25_table[] = { { }, }; -void __init x25_register_sysctl(void) +int __init x25_register_sysctl(void) { x25_table_header = register_net_sysctl(&init_net, "net/x25", x25_table); + if (!x25_table_header) + return -ENOMEM; + return 0; } void x25_unregister_sysctl(void) |
