From patchwork Sat Dec 16 03:29:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Overstreet X-Patchwork-Id: 13495400 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86E76C4332F for ; Sat, 16 Dec 2023 03:30:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9A9CB8D014A; Fri, 15 Dec 2023 22:30:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 908748D0143; Fri, 15 Dec 2023 22:30:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7813A8D014A; Fri, 15 Dec 2023 22:30:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 604B28D0143 for ; Fri, 15 Dec 2023 22:30:15 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 3E0F8C0548 for ; Sat, 16 Dec 2023 03:30:15 +0000 (UTC) X-FDA: 81571253190.05.70C897F Received: from out-177.mta0.migadu.com (out-177.mta0.migadu.com [91.218.175.177]) by imf08.hostedemail.com (Postfix) with ESMTP id BD2FE160006 for ; Sat, 16 Dec 2023 03:30:13 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=BT9Ag6IZ; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf08.hostedemail.com: domain of kent.overstreet@linux.dev designates 91.218.175.177 as permitted sender) smtp.mailfrom=kent.overstreet@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702697413; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=BWWbNWB6VpQ4v6HXE97z0y+8sBKzqDJYsJkDQq7GMzU=; b=NLOCEw3zxcXkx+N9GlM0Guj4vb0LG7LyBIrQMxVwNqBjiPqh5p2yJzR3XcChb/uI7vmTiq ahPVor/fNrEVkAr1uGFWWUPVE2djn5LVfKaluXGz1bzxtZrSGrr8xauBsdOiea5F9Tkozj ZwjojLZv9+ChQXUo2NDC+4gT7mWB0QA= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=BT9Ag6IZ; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf08.hostedemail.com: domain of kent.overstreet@linux.dev designates 91.218.175.177 as permitted sender) smtp.mailfrom=kent.overstreet@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702697413; a=rsa-sha256; cv=none; b=iTi/JRt+hw+hl5U/nj7kq2wQOTal4wWBbWOn/qJ4bMDqPx0+bBDD8H/LVEgf9GmnTFts7O hEEU/mSf2BL1mC42aDBcBiJFKOVjZZ6iBcPWWF/BP3/6SnpBzl34+ISijB6B8kbc0AmiDF V9LgDSJft4yPcYVuoyK8eghJSbWzUMM= 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 To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , 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 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 X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Stat-Signature: t73rhy9ynh1qqmgcqdnzq57f1wqxz7zh X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: BD2FE160006 X-HE-Tag: 1702697413-111969 X-HE-Meta: U2FsdGVkX1/rgGdTXVR5muVeYV9PY3x+8V1vb82JSbQ9+s3155m0WPU8k/ysp6+tq+yBTDvzO6G+MOQw9b2troBItSTiXT7cYX5BdLzdQ321c80SrmK8sQkmvkr7L+2LjRhCpFw7OzS468QxRBvQeZNAm8nvTIftVfZqgdMgM1VMAoQPoMz+pEOeVMMIcD4pAcImC+zMn++GQ09OZe3bh9NCbw6aZZacax/AhqvDlAafjdQjcNcuvPbdcAFDUyS9+reRl4/v6AKGJna9+Ht9BLT3xFoqp0DuiUwrRiKo0zNIgAfes/1t5P6QeAa/RS3l4hPFNhlDfKkLwNLmbHhBDcSYsTpxkkrzdcI30WQc22goDB45mB6sWrGsXxvXNbmB0D2P+fgeqGBudgd94z3GCLQqEukgesKK86PAJhPVcG/d+Ln3E2T/I5bc2bbkJ3BgI7jYNX9Z9e2rGyi82PODAyCB8Jb59Y6yjdqJNjkWgEArdsoc0kdHWSHymVPHGxXXyB+snEOSMFSqKZU1f5si28OCjVxI40R2yU55WG/PHGsaQn/q83yxmAboY5p/+ARpikoX4h7qS15/IQzvlsPG7v2gus0dLemJa7MhUG01LtA5QO9eGq3yacMVHI/4JMhHhfa8cBOgPMS7mBHkPVgUHiCPFWpvQyA/dAX4/H9VBDXCp8LOxBJmu6iba/tgP6IPRDrZDM8hv3bOaceRz/HflXDEcpLsb4zTVimPWJViASCFFnPb/70LqVD2bvwFTIiu/XiwhPCcm2NWLpGM2Xf/ENthYgnPw1m1Fw5RKcfg357MbxVs8b/zN99BpOo8ysHaw4j6uGSQ29ivyffKBMT7PcFrJ+zAKub3sH87vxuti44qjXfNsSYR6YJfQyIo0BEUjoeOiuTGRmiu/hGVWoqnKwQfRXNZDWeL X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: "Matthew Wilcox (Oracle)" 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) Signed-off-by: Kent Overstreet Reviewed-by: Christian Brauner --- include/linux/wait.h | 1 - kernel/exit.c | 4 +++- kernel/pid_namespace.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) 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 #include -#include 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 #include #include - #include + +#include + #include #include 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 #include #include +#include #include "pid_sysctl.h" static DEFINE_MUTEX(pid_caches_mutex);