tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

wait: Remove uapi header file from main header file

There's really no overlap between uapi/linux/wait.h and linux/wait.h.
There are two files which rely on the uapi file being implcitly included,
so explicitly include it there and remove it from the main header file.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Reviewed-by: Christian Brauner <brauner@kernel.org>

authored by

Matthew Wilcox (Oracle) and committed by
Kent Overstreet 6dfeff09 8b7787a5

+4 -2
-1
include/linux/wait.h
··· 9 9 #include <linux/spinlock.h> 10 10 11 11 #include <asm/current.h> 12 - #include <uapi/linux/wait.h> 13 12 14 13 typedef struct wait_queue_entry wait_queue_entry_t; 15 14
+3 -1
kernel/exit.c
··· 69 69 #include <linux/rethook.h> 70 70 #include <linux/sysfs.h> 71 71 #include <linux/user_events.h> 72 - 73 72 #include <linux/uaccess.h> 73 + 74 + #include <uapi/linux/wait.h> 75 + 74 76 #include <asm/unistd.h> 75 77 #include <asm/mmu_context.h> 76 78
+1
kernel/pid_namespace.c
··· 23 23 #include <linux/sched/task.h> 24 24 #include <linux/sched/signal.h> 25 25 #include <linux/idr.h> 26 + #include <uapi/linux/wait.h> 26 27 #include "pid_sysctl.h" 27 28 28 29 static DEFINE_MUTEX(pid_caches_mutex);