diff options
author | Mark Brown <broonie@kernel.org> | 2016-02-05 19:28:22 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-02-05 19:28:22 +0000 |
commit | cd6f5814252060db2d38f57c602db33696c549c0 (patch) | |
tree | 0bcf23a07f1316cb57f0127e5b1622fea59c3e8e /include/linux/sched.h | |
parent | d235b7b42ab59e2e616082a0735b3bcc76685c7b (diff) | |
parent | e14ca734b547e3187713441909897aefdf4e4016 (diff) |
Merge tag 'v3.10.96' into linux-linaro-lsk-v3.10lsk-v3.10-16.02
This is the 3.10.96 stable release
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 55225af46134..71d34452df5c 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -670,6 +670,7 @@ struct user_struct { unsigned long mq_bytes; /* How many bytes can be allocated to mqueue? */ #endif unsigned long locked_shm; /* How many pages of mlocked shm ? */ + unsigned long unix_inflight; /* How many files in flight in unix sockets */ #ifdef CONFIG_KEYS struct key *uid_keyring; /* UID specific keyring */ |