| Message ID | 20190906153249.1864324-1-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] watch_queue: make locked_vm accessible | expand |
On 9/6/19 9:32 AM, Arnd Bergmann wrote: > The locked_vm member of struct user_struct is guarded by an #ifdef, > which breaks building the new watch_queue driver when all the other > subsystems that need it are disabled: > > drivers/misc/watch_queue.c:315:38: error: no member named 'locked_vm' in 'struct user_struct'; did you mean 'locked_shm'? > > Add watch_queue to the list. Should we either: 1) Make it unconditionally available or 2) Introduce a symbol for this that others can select, like CONFIG_NEEDS_USER_LOCKED_VM or something like that. ? -- Jens Axboe
diff --git a/include/linux/sched/user.h b/include/linux/sched/user.h index 917d88edb7b9..6cd21c7bb83e 100644 --- a/include/linux/sched/user.h +++ b/include/linux/sched/user.h @@ -33,7 +33,7 @@ struct user_struct { kuid_t uid; #if defined(CONFIG_PERF_EVENTS) || defined(CONFIG_BPF_SYSCALL) || \ - defined(CONFIG_NET) || defined(CONFIG_IO_URING) + defined(CONFIG_NET) || defined(CONFIG_IO_URING) || defined(CONFIG_WATCH_QUEUE) atomic_long_t locked_vm; #endif
The locked_vm member of struct user_struct is guarded by an #ifdef, which breaks building the new watch_queue driver when all the other subsystems that need it are disabled: drivers/misc/watch_queue.c:315:38: error: no member named 'locked_vm' in 'struct user_struct'; did you mean 'locked_shm'? Add watch_queue to the list. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- include/linux/sched/user.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.0