From 0c8ecee92c2241adf9ca910aa42ef0112913b817 Mon Sep 17 00:00:00 2001 From: Chuck Anderson Date: Fri, 10 Jun 2016 13:53:15 -0700 Subject: [PATCH] add user_struct element unix_inflight pre-req for "pipe: limit the per-user amount of pages allocated in pipes" The commit: pipe: limit the per-user amount of pages allocated in pipes caused a merge conflict with uek/uek-4.1 due to: c057264c4ba7ddf9d775c013fcb1cecb910bf2b9 fix kABI breakage from "unix: properly account for FDs passed over unix sock Add include/linux/sched.h user_struct change from c057264c so that the code context matches uek/uek-4.1 Orabug: 22901731 Signed-off-by: Chuck Anderson --- include/linux/sched.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/linux/sched.h b/include/linux/sched.h index 26a2e6122734..ac361b95ca63 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -815,6 +815,9 @@ struct user_struct { #ifdef CONFIG_PERF_EVENTS atomic_long_t locked_vm; #endif +#ifndef __GENKSYMS__ + unsigned long unix_inflight; /* How many files in flight in unix sockets */ +#endif }; extern int uids_sysfs_init(void); -- 2.50.1