diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 19:11:44 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 19:11:44 -0400 |
| commit | 08cd84c81f27d5bd22ba958b7cae6d566c509280 (patch) | |
| tree | 6fdb546c151410851fd3c604d42590afa4215084 /kernel/user.c | |
| parent | e9dd2561793c05d70c9df1bc16a2dde6f23388df (diff) | |
| parent | 327309e899662b482c58cf25f574513d38b5788c (diff) | |
| download | op-kernel-dev-08cd84c81f27d5bd22ba958b7cae6d566c509280.zip op-kernel-dev-08cd84c81f27d5bd22ba958b7cae6d566c509280.tar.gz | |
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'kernel/user.c')
| -rw-r--r-- | kernel/user.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/user.c b/kernel/user.c index 734575d..89e562f 100644 --- a/kernel/user.c +++ b/kernel/user.c @@ -120,6 +120,10 @@ struct user_struct * alloc_uid(uid_t uid) atomic_set(&new->processes, 0); atomic_set(&new->files, 0); atomic_set(&new->sigpending, 0); +#ifdef CONFIG_INOTIFY + atomic_set(&new->inotify_watches, 0); + atomic_set(&new->inotify_devs, 0); +#endif new->mq_bytes = 0; new->locked_shm = 0; |
