diff mbox series

[25/50] wait: Remove uapi header file from main header file

Message ID	20231216032957.3553313-4-kent.overstreet@linux.dev (mailing list archive)
State	New
Headers	show Return-Path: <owner-linux-mm@kvack.org> From: Kent Overstreet <kent.overstreet@linux.dev> To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, tglx@linutronix.de, x86@kernel.org, tj@kernel.org, peterz@infradead.org, mathieu.desnoyers@efficios.com, paulmck@kernel.org, keescook@chromium.org, dave.hansen@linux.intel.com, mingo@redhat.com, will@kernel.org, longman@redhat.com, boqun.feng@gmail.com, brauner@kernel.org, Kent Overstreet <kent.overstreet@linux.dev> Subject: [PATCH 25/50] wait: Remove uapi header file from main header file Date: Fri, 15 Dec 2023 22:29:31 -0500 Message-ID: <20231216032957.3553313-4-kent.overstreet@linux.dev> In-Reply-To: <20231216032957.3553313-1-kent.overstreet@linux.dev> References: <20231216024834.3510073-1-kent.overstreet@linux.dev> <20231216032957.3553313-1-kent.overstreet@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	big header dependency cleanup targeting sched.h \| expand [00/50] big header dependency cleanup targeting sched.h [01/50] drivers/gpu/drm/i915/i915_memcpy.c: fix missing includes [02/50] x86/kernel/fpu/bugs.c: fix missing include [03/50] x86/lib/cache-smp.c: fix missing include [04/50] x86/include/asm/debugreg.h: fix missing include [05/50] x86/include/asm/paravirt_types.h: fix missing include [06/50] task_stack.h: add missing include [07/50] nsproxy.h: add missing include [08/50] kernel/fork.c: add missing include [09/50] kmsan: add missing types.h dependency [10/50] time_namespace.h: fix missing include [11/50] nodemask: Split out include/linux/nodemask_types.h [12/50] prandom: Remove unused include [13/50] timekeeping: Kill percpu.h dependency [14/50] arm64: Fix circular header dependency [15/50] kernel/numa.c: Move logging out of numa.h [16/50] sched.h: Move (spin\|rwlock)_needbreak() to spinlock.h [17/50] ktime.h: move ktime_t to types.h [18/50] hrtimers: Split out hrtimer_types.h [19/50] locking/mutex: split out mutex_types.h [20/50] posix-cpu-timers: Split out posix-timers_types.h [21/50] locking/seqlock: Split out seqlock_types.h [22/50] pid: Split out pid_types.h [23/50] sched.h: move pid helpers to pid.h [24/50] plist: Split out plist_types.h [25/50] wait: Remove uapi header file from main header file [26/50] rslib: kill bogus dependency on list.h [27/50] timerqueue: Split out timerqueue_types.h [28/50] signal: Kill bogus dependency on list.h [29/50] timers: Split out timer_types.h [30/50] workqueue: Split out workqueue_types.h [31/50] shm: Slim down dependencies [32/50] ipc: Kill bogus dependency on spinlock.h [33/50] Split out irqflags_types.h [34/50] mm_types_task.h: Trim dependencies [35/50] cpumask: Split out cpumask_types.h [36/50] syscall_user_dispatch.h: split out *_types.h [37/50] x86/signal: kill dependency on time.h [38/50] uapi/linux/resource.h: fix include [39/50] refcount: Split out refcount_types.h [40/50] seccomp: Split out seccomp_types.h [41/50] uidgid: Split out uidgid_types.h [42/50] sem: Split out sem_types.h [43/50] lockdep: move held_lock to lockdep_types.h [44/50] restart_block: Trim includes [45/50] rseq: Split out rseq.h from sched.h [46/50] preempt.h: Kill dependency on list.h [47/50] thread_info, uaccess.h: Move HARDENED_USERCOPY to better location [48/50] Kill unnecessary kernel.h include [49/50] kill unnecessary thread_info.h include [50/50] Kill sched.h dependency on rcupdate.h

Commit Message

Kent Overstreet Dec. 16, 2023, 3:29 a.m. UTC

From: "Matthew Wilcox (Oracle)" <willy@infradead.org>

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>
---
 include/linux/wait.h   | 1 -
 kernel/exit.c          | 4 +++-
 kernel/pid_namespace.c | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

Comments

Christian Brauner Dec. 18, 2023, 12:39 p.m. UTC | #1

On Fri, Dec 15, 2023 at 10:29:31PM -0500, Kent Overstreet wrote:
> From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
> 
> 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>

diff mbox series

Patch

diff --git a/include/linux/wait.h b/include/linux/wait.h
index 3473b663176f..8aa3372f21a0 100644
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -9,7 +9,6 @@ 
 #include <linux/spinlock.h>
 
 #include <asm/current.h>
-#include <uapi/linux/wait.h>
 
 typedef struct wait_queue_entry wait_queue_entry_t;
 
diff --git a/kernel/exit.c b/kernel/exit.c
index ee9f43bed49a..2ef33047371b 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -69,8 +69,10 @@ 
 #include <linux/rethook.h>
 #include <linux/sysfs.h>
 #include <linux/user_events.h>
-
 #include <linux/uaccess.h>
+
+#include <uapi/linux/wait.h>
+
 #include <asm/unistd.h>
 #include <asm/mmu_context.h>
 
diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
index 3028b2218aa4..7ade20e95232 100644
--- a/kernel/pid_namespace.c
+++ b/kernel/pid_namespace.c
@@ -23,6 +23,7 @@ 
 #include <linux/sched/task.h>
 #include <linux/sched/signal.h>
 #include <linux/idr.h>
+#include <uapi/linux/wait.h>
 #include "pid_sysctl.h"
 
 static DEFINE_MUTEX(pid_caches_mutex);