diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-02-17 10:37:36 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-02-17 10:37:36 +0100 |
commit | 9109dc97b0155e500cdf3bcd91507bc24defefc1 (patch) | |
tree | 5d721cbfeb3576dc6969093ab04f17666737b6a4 /include/net/scm.h | |
parent | 27f6d22b037b2be6685e0e27cce929779d634119 (diff) | |
parent | 059fcd8cd16622da6513804a7a3e826d152c6c96 (diff) |
Merge branch 'perf/urgent' into perf/core, to queue up dependent patch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/net/scm.h')
-rw-r--r-- | include/net/scm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/scm.h b/include/net/scm.h index 262532d111f51..59fa93c01d2a1 100644 --- a/include/net/scm.h +++ b/include/net/scm.h @@ -21,6 +21,7 @@ struct scm_creds { struct scm_fp_list { short count; short max; + struct user_struct *user; struct file *fp[SCM_MAX_FD]; }; |