diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 20:36:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 20:36:46 -0400 |
commit | 826509f8110049663799bc20f2b5b6170e2f78ca (patch) | |
tree | 9d8823cf283592625b882125b4b13988f2934cc6 /kernel/audit.c | |
parent | d992895ba2b27cf5adf1ba0ad6d27662adc54c5e (diff) | |
parent | c530cfb1ce1e8f230744c3f3bd86771f50725053 (diff) |
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
Diffstat (limited to 'kernel/audit.c')
-rw-r--r-- | kernel/audit.c | 3 |
1 files changed, 2 insertions, 1 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 | ||