diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-03-12 15:01:07 (GMT) |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-03-12 15:01:07 (GMT) |
| commit | ffb12cf002edbc5927079f51bebde428d601f723 (patch) | |
| tree | 1f04d80df9db8883037d59c81f5836770eecfdc6 /kernel/audit_watch.c | |
| parent | 1a75b8e64571a85d5e648cfdf4c40e0d9923abc5 (diff) | |
| parent | c1bacbae8192dd2a9ebadd22d793b68054f6c6e5 (diff) | |
| download | linux-ffb12cf002edbc5927079f51bebde428d601f723.tar.xz | |
Merge branch 'irq/for-gpio' into irq/core
Merge the request/release callbacks which are in a separate branch for
consumption by the gpio folks.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/audit_watch.c')
| -rw-r--r-- | kernel/audit_watch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c index 2596fac..70b4554 100644 --- a/kernel/audit_watch.c +++ b/kernel/audit_watch.c @@ -471,7 +471,7 @@ static int audit_watch_handle_event(struct fsnotify_group *group, struct fsnotify_mark *inode_mark, struct fsnotify_mark *vfsmount_mark, u32 mask, void *data, int data_type, - const unsigned char *dname) + const unsigned char *dname, u32 cookie) { struct inode *inode; struct audit_parent *parent; |