Merge tag 'v3.10.103' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 069b33c3f972f671a94055b23aba1a69bdf11f57..7d5ffda71119b664757cea2d117c1790ea70bdb6 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -673,6 +673,8 @@ 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 */
+       atomic_long_t pipe_bufs;  /* how many pages are allocated in pipe buffers */
 
 #ifdef CONFIG_KEYS
        struct key *uid_keyring;        /* UID specific keyring */