diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/audit.c | 3 | ||||
| -rw-r--r-- | kernel/sysctl.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index ef35166fdc29..7f0699790d46 100644 --- a/kernel/audit.c +++ b/kernel/audit.c | |||
| @@ -514,7 +514,8 @@ static int __init audit_init(void) | |||
| 514 | { | 514 | { |
| 515 | printk(KERN_INFO "audit: initializing netlink socket (%s)\n", | 515 | printk(KERN_INFO "audit: initializing netlink socket (%s)\n", |
| 516 | audit_default ? "enabled" : "disabled"); | 516 | audit_default ? "enabled" : "disabled"); |
| 517 | audit_sock = netlink_kernel_create(NETLINK_AUDIT, audit_receive); | 517 | audit_sock = netlink_kernel_create(NETLINK_AUDIT, 0, audit_receive, |
| 518 | THIS_MODULE); | ||
| 518 | if (!audit_sock) | 519 | if (!audit_sock) |
| 519 | audit_panic("cannot initialize netlink socket"); | 520 | audit_panic("cannot initialize netlink socket"); |
| 520 | 521 | ||
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 3e0bbee549ea..8e56e2495542 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/smp_lock.h> | 31 | #include <linux/smp_lock.h> |
| 32 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 33 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
| 34 | #include <linux/net.h> | ||
| 34 | #include <linux/sysrq.h> | 35 | #include <linux/sysrq.h> |
| 35 | #include <linux/highuid.h> | 36 | #include <linux/highuid.h> |
| 36 | #include <linux/writeback.h> | 37 | #include <linux/writeback.h> |
| @@ -136,9 +137,6 @@ static struct ctl_table_header root_table_header = | |||
| 136 | 137 | ||
| 137 | static ctl_table kern_table[]; | 138 | static ctl_table kern_table[]; |
| 138 | static ctl_table vm_table[]; | 139 | static ctl_table vm_table[]; |
| 139 | #ifdef CONFIG_NET | ||
| 140 | extern ctl_table net_table[]; | ||
| 141 | #endif | ||
| 142 | static ctl_table proc_table[]; | 140 | static ctl_table proc_table[]; |
| 143 | static ctl_table fs_table[]; | 141 | static ctl_table fs_table[]; |
| 144 | static ctl_table debug_table[]; | 142 | static ctl_table debug_table[]; |
