Message ID | 20231216032957.3553313-4-kent.overstreet@linux.dev |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-2003-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp16423dyi; Fri, 15 Dec 2023 19:32:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IG2bJHaKfHj/yPO6PKksnU4QWiAoC3htsJECLAojMJBeiZ8TxPsYvpkez8Dxo9qhgkIgJY+ X-Received: by 2002:a50:aa96:0:b0:552:7473:101d with SMTP id q22-20020a50aa96000000b005527473101dmr2374097edc.32.1702697529124; Fri, 15 Dec 2023 19:32:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702697529; cv=none; d=google.com; s=arc-20160816; b=KVwfzBwn7Zx5tu54mu8CPrfVaDYRds/prwNevEOrC0EdCcic/lFb07YVuzi1mUu0nF FNsIu7PabJwMrLeEd5AuunZtAeY5TGbC2EBjeQ6gD2uSeAIi3V2t+/JXPuCQC3C45ixn JBFsAKsCM7gzpxvStdk5+rRjmXcPTZXqEYCpnW4IGDQLOUMSj4FflJTHjNM23I8cOKPx gRJXasuT6se1BTs5MJ0/7LWSN0Zj4u1vXZAlxHWuifCgmFQEsagFIYrWwdy4OiwnOlGp M7znA2e8WjxUvv8pQsq4rmmNNX4gKHMa+LwT4tmFxSBvdl+wKSA1r8FvVAlR1LIsL+Cx R7rQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=BWWbNWB6VpQ4v6HXE97z0y+8sBKzqDJYsJkDQq7GMzU=; fh=Y0S32WyXoK2afK1asdfTsejF7K45bibmBVh2KgKTKgw=; b=GGp4oVH50ZOUCnck8VjQdAbOotCcBJlhfOHHlm0Tc7YupGyWEUPOzwomU7Afad61Yz e2wDP/V0K8P6yXYRpkTs93FZd33OJEM260jE6Kum4tTULJ2DyzG0VHptyNceINec6czk dfykDKX6snVR+7CzLNicsX+2R1aDQamnjebGcNukHnR77xe7tutdq+6wPLVI4tN74+5e Ogw4zRLp9YcVQoOJPg2z8/Wbi/1D1lGPE+eaTCcvfTj5KnJJpU3BHFK+0UEw0bSn8zIB wCGtiXxful+Nn+dso//i7LfCnKCLYZN+f0Kr02Nf4QNXBvE9C6AIiOI4eMDxpDyDKfRL ERRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=BT9Ag6IZ; spf=pass (google.com: domain of linux-kernel+bounces-2003-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-2003-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id u30-20020a50951e000000b0054cfed181d5si8286772eda.595.2023.12.15.19.32.08 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 19:32:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-2003-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=BT9Ag6IZ; spf=pass (google.com: domain of linux-kernel+bounces-2003-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-2003-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id B94DA1F25B44 for <ouuuleilei@gmail.com>; Sat, 16 Dec 2023 03:32:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A5A6119452; Sat, 16 Dec 2023 03:30:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="BT9Ag6IZ" X-Original-To: linux-kernel@vger.kernel.org Received: from out-174.mta0.migadu.com (out-174.mta0.migadu.com [91.218.175.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 340A8134D9 for <linux-kernel@vger.kernel.org>; Sat, 16 Dec 2023 03:30:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1702697412; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BWWbNWB6VpQ4v6HXE97z0y+8sBKzqDJYsJkDQq7GMzU=; b=BT9Ag6IZF8G1irnOMIJzzmo2Vm7P/PbA51fsRpCFyMHM7GkF/KyOo7s5nF5ZUtg9mtgohM MnPdk+4WGq9bmhVq5Z8iwMdIf+sOgRsg9c57jBEdlN65RQArj8/UnDj+5G7LOogiGRFx7P rWWZWziTLjPAuIQlwfGV05WGcaXEg4U= 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785407763997374586 X-GMAIL-MSGID: 1785407763997374586 |
Series |
big header dependency cleanup targeting sched.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
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 --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);