diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
| commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
| tree | fcf504879883763557e696eff81427b1ab78f76b /kernel/auditsc.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'kernel/auditsc.c')
| -rw-r--r-- | kernel/auditsc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index f3a461c0970a..3828ad5fb8f1 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
| @@ -49,6 +49,7 @@ | |||
| 49 | #include <linux/namei.h> | 49 | #include <linux/namei.h> |
| 50 | #include <linux/mm.h> | 50 | #include <linux/mm.h> |
| 51 | #include <linux/module.h> | 51 | #include <linux/module.h> |
| 52 | #include <linux/slab.h> | ||
| 52 | #include <linux/mount.h> | 53 | #include <linux/mount.h> |
| 53 | #include <linux/socket.h> | 54 | #include <linux/socket.h> |
| 54 | #include <linux/mqueue.h> | 55 | #include <linux/mqueue.h> |
| @@ -1893,7 +1894,7 @@ static int audit_inc_name_count(struct audit_context *context, | |||
| 1893 | { | 1894 | { |
| 1894 | if (context->name_count >= AUDIT_NAMES) { | 1895 | if (context->name_count >= AUDIT_NAMES) { |
| 1895 | if (inode) | 1896 | if (inode) |
| 1896 | printk(KERN_DEBUG "name_count maxed, losing inode data: " | 1897 | printk(KERN_DEBUG "audit: name_count maxed, losing inode data: " |
| 1897 | "dev=%02x:%02x, inode=%lu\n", | 1898 | "dev=%02x:%02x, inode=%lu\n", |
| 1898 | MAJOR(inode->i_sb->s_dev), | 1899 | MAJOR(inode->i_sb->s_dev), |
| 1899 | MINOR(inode->i_sb->s_dev), | 1900 | MINOR(inode->i_sb->s_dev), |