From nobody Sun Feb 8 14:10:41 2026 Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 498175B685 for ; Sun, 11 Feb 2024 12:30:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707654632; cv=none; b=QvVz/rP2u5H4D8qvLX0xY04p0pJC/0j1zQDzY74hJi1A6lTvgLylrl/dUBEgeKUo9XLAW+hazluJkZmJqC7waOoIK4KOFhbQCJXz+J3ESfVB1ir8vt/2aKRhw2jh5J2ugkLyHxo317+bBTOQy/AxbBlj1bwHWx5Z3ViEsW455PA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707654632; c=relaxed/simple; bh=JQYxptJhqO5awjGqkfmWG6XGmLeDv7O1QFbH3PdEe64=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=h/NucP6A8650MNDgAvIPcja9d71m1FHe4E4z7q6etH30ZCO99XyEbJ1ZiH0gIatFyro+RrqcqJUngLrWN/gxiZnifWgd1BNsljt3TNcDAlK90e+gWSsfVcBvIVq89L9togMiMQQDjNKDSCxdFnMQsdUgInYqKYh6LFiEhdmWZtE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ionos.com; spf=pass smtp.mailfrom=ionos.com; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b=efO4rDld; arc=none smtp.client-ip=209.85.208.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ionos.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionos.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b="efO4rDld" Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-558f523c072so3593891a12.2 for ; Sun, 11 Feb 2024 04:30:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1707654627; x=1708259427; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OTJVQKhBTkCCcRGvhQiMHvkmUke5OhffbI8haRgPHik=; b=efO4rDldy2AzDERib+e1yiqBW7Vq5QajBOvaQ+RRe2X/CkqO610woEhXH+Zv+4q/qH X7vH4zJMjF+BdLR1rhTlCHUi3+tmociG+qRaZhfrJ+7Ui71SLXPkQ3z8Kpq8mViVpJki MV+Mo9DQYnsSah3Z5Ral5rdYvkjvFXpL/nf9v6CrP00Y7evssT6IbbjcUFqHAIYwbjDb 03jmD/Nrv4beAO7uv3X9P+wS1I+eYBI1FsKxWSYLhdSNuvW72oFux9gN2HSt3W70ZRUO HJ4WyTJyDuRlNyAcvJxQG9A+HdFr4YeqE2eS3Z3GLX4CSgygENgiLPF7ZuhKUMfmwK70 EzZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707654627; x=1708259427; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OTJVQKhBTkCCcRGvhQiMHvkmUke5OhffbI8haRgPHik=; b=TrPagxvt1hohKE/M2fOkB9SuFhltt6+NtR5aKtbBOaoE9Ay8phBlHoXOKcYDnvg7Ni N91RS2jsT/UNbZkVYom9Z0cEJVKYzk9CmnCHYBf3+5X0cGsNcyMHftKySfHQBKOXJntV jlo8dMus3/Zlu8WykApH2c3HfWs/zRJx3bEUOw4mKu8WWjIEeu0Ofs10Y+BT6p5mY4fC ypp1kYr/nBpXY5LfXCMWuvEtrbTfZx+eZk3veLgNVop5BNzStZkBKVgruH0yDB8xtrlC a51jhu3TBzdb8p+eOIqIC9wcC9IaCVM0R1bgzTGxnoPRixi0qbDMH5OqyQSQxR+o1Cky 8W3w== X-Gm-Message-State: AOJu0YyYwrHP74yzTSvh8JasUdqfoAzFqqb1ybUNtmviHFDb56SkQgQ3 feUOD1BdxUn1s+ELWZwwvmIKJePmtzZRSi5CKq2HMLyhNKBH8n1n4ICGhc+4Epb7wRryaPl0ume Y X-Google-Smtp-Source: AGHT+IHwVwxCLwxUbNGjxZJ2l1okpkk4NhSoSrOAtWizCZ0PnHViKAeZSiwBL49tuPwJIuRKMCc7GA== X-Received: by 2002:aa7:c3cd:0:b0:55f:f608:9f6a with SMTP id l13-20020aa7c3cd000000b0055ff6089f6amr3520317edr.7.1707654627003; Sun, 11 Feb 2024 04:30:27 -0800 (PST) Received: from raven.intern.cm-ag (p200300dc6f267100023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f26:7100:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id fj18-20020a0564022b9200b0056187ca4120sm1024611edb.10.2024.02.11.04.30.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 04:30:26 -0800 (PST) From: Max Kellermann To: linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH v3 13/35] wait.h: move declarations to wait_types.h Date: Sun, 11 Feb 2024 13:29:38 +0100 Message-Id: <20240211123000.3359365-14-max.kellermann@ionos.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240211123000.3359365-1-max.kellermann@ionos.com> References: <20240211123000.3359365-1-max.kellermann@ionos.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" By providing declarations in a lean header, we can reduce header dependencies. Signed-off-by: Max Kellermann --- drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 2 +- include/drm/gpu_scheduler.h | 2 +- include/linux/backing-dev-defs.h | 2 +- include/linux/blkdev.h | 2 +- include/linux/buffer_head.h | 2 +- include/linux/ceph/libceph.h | 2 +- include/linux/cgroup-defs.h | 2 +- include/linux/console_struct.h | 2 +- include/linux/counter.h | 2 +- include/linux/dcache.h | 2 +- include/linux/dma-buf.h | 2 +- include/linux/eventfd.h | 2 +- include/linux/gnss.h | 2 +- include/linux/libps2.h | 2 +- include/linux/lp.h | 2 +- include/linux/mempool.h | 2 +- include/linux/mhi.h | 2 +- include/linux/mmzone.h | 2 +- include/linux/net.h | 2 +- include/linux/nfs_fs_sb.h | 2 +- include/linux/parport.h | 2 +- include/linux/pid.h | 2 +- include/linux/pm.h | 2 +- include/linux/poll.h | 2 +- include/linux/psi_types.h | 2 +- include/linux/relay.h | 2 +- include/linux/rtnetlink.h | 2 +- include/linux/sbitmap.h | 2 +- include/linux/sunrpc/rpc_pipe_fs.h | 2 +- include/linux/syslog.h | 2 +- include/linux/tty_port.h | 2 +- include/linux/wait.h | 23 +------------------ include/linux/wait_bit.h | 2 +- include/linux/wait_types.h | 31 ++++++++++++++++++++++++++ include/media/dvb_ringbuffer.h | 2 +- include/net/smc.h | 2 +- include/net/sock.h | 2 +- include/scsi/libiscsi.h | 2 +- include/sound/control.h | 2 +- include/sound/rawmidi.h | 2 +- 40 files changed, 70 insertions(+), 60 deletions(-) create mode 100644 include/linux/wait_types.h diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h b/drivers/gpu/drm/amd/a= mdgpu/amdgpu_ih.h index 59a5bc9b1120..6e01527b2be5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h @@ -25,7 +25,7 @@ #define __AMDGPU_IH_H__ =20 #include -#include +#include =20 /* Maximum number of IVs processed at once */ #define AMDGPU_IH_MAX_NUM_IVS 32 diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h index 4edd7ac64b62..05591cc987c2 100644 --- a/include/drm/gpu_scheduler.h +++ b/include/drm/gpu_scheduler.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include =20 #define MAX_WAIT_SCHED_ENTITY_Q_EMPTY msecs_to_jiffies(1000) diff --git a/include/linux/backing-dev-defs.h b/include/linux/backing-dev-d= efs.h index 720a88bb3513..ffdd82f2f3e6 100644 --- a/include/linux/backing-dev-defs.h +++ b/include/linux/backing-dev-defs.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include =20 diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 26344147adec..2a8df9c0e87b 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index d78454a4dd1f..15dffb5374fb 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include =20 enum bh_state_bits { diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h index d01be9103e56..12eb9c9f6620 100644 --- a/include/linux/ceph/libceph.h +++ b/include/linux/ceph/libceph.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index 380a59b31624..99e24f3034df 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h index a0142b93eaf9..8babdd50a4ca 100644 --- a/include/linux/console_struct.h +++ b/include/linux/console_struct.h @@ -13,7 +13,7 @@ #ifndef _LINUX_CONSOLE_STRUCT_H #define _LINUX_CONSOLE_STRUCT_H =20 -#include +#include #include #include =20 diff --git a/include/linux/counter.h b/include/linux/counter.h index 846b94517c5b..638ebb5b4d27 100644 --- a/include/linux/counter.h +++ b/include/linux/counter.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include =20 struct counter_device; diff --git a/include/linux/dcache.h b/include/linux/dcache.h index 04ab9e67046c..560ca5e16f1e 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include =20 struct path; struct file; diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h index 8ff4add71f88..ab67e5a4b0ec 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include =20 struct device; struct dma_buf; diff --git a/include/linux/eventfd.h b/include/linux/eventfd.h index 7199c5039561..5f41551db2f1 100644 --- a/include/linux/eventfd.h +++ b/include/linux/eventfd.h @@ -9,7 +9,7 @@ #ifndef _LINUX_EVENTFD_H #define _LINUX_EVENTFD_H =20 -#include +#include #include #include #include diff --git a/include/linux/gnss.h b/include/linux/gnss.h index 9f38ff948d78..3c24e934b732 100644 --- a/include/linux/gnss.h +++ b/include/linux/gnss.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include =20 struct gnss_device; =20 diff --git a/include/linux/libps2.h b/include/linux/libps2.h index 006c38667e75..c2f438730ae1 100644 --- a/include/linux/libps2.h +++ b/include/linux/libps2.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include =20 struct ps2dev; =20 diff --git a/include/linux/lp.h b/include/linux/lp.h index 337573412852..d700bf3255b1 100644 --- a/include/linux/lp.h +++ b/include/linux/lp.h @@ -9,7 +9,7 @@ #define _LINUX_LP_H =20 =20 -#include +#include #include #include =20 diff --git a/include/linux/mempool.h b/include/linux/mempool.h index 16c5cc807ff6..d3df002ac3b7 100644 --- a/include/linux/mempool.h +++ b/include/linux/mempool.h @@ -5,7 +5,7 @@ #ifndef _LINUX_MEMPOOL_H #define _LINUX_MEMPOOL_H =20 -#include +#include #include =20 struct kmem_cache; diff --git a/include/linux/mhi.h b/include/linux/mhi.h index bd99f47726dc..243bfae1a94c 100644 --- a/include/linux/mhi.h +++ b/include/linux/mhi.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include =20 #define MHI_MAX_OEM_PK_HASH_SEGMENTS 16 diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index ce11c2dab2bc..fa41c34f16da 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/linux/net.h b/include/linux/net.h index c9b4a63791a4..139a936fb772 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -16,7 +16,7 @@ =20 #include #include -#include +#include #include /* For O_CLOEXEC and O_NONBLOCK */ #include #include diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h index 08860ceda787..1c9a1e28b13e 100644 --- a/include/linux/nfs_fs_sb.h +++ b/include/linux/nfs_fs_sb.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include =20 diff --git a/include/linux/parport.h b/include/linux/parport.h index c8e3b71a3b49..783835d05d9b 100644 --- a/include/linux/parport.h +++ b/include/linux/parport.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/linux/pid.h b/include/linux/pid.h index 8124d57752b9..fd9d9c054585 100644 --- a/include/linux/pid.h +++ b/include/linux/pid.h @@ -7,7 +7,7 @@ #include #include #include -#include +#include =20 /* * What is struct pid? diff --git a/include/linux/pm.h b/include/linux/pm.h index 303a143c4e04..c1533ce86893 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include =20 diff --git a/include/linux/poll.h b/include/linux/poll.h index a9e0e1c2d1f2..043aa684b09c 100644 --- a/include/linux/poll.h +++ b/include/linux/poll.h @@ -5,7 +5,7 @@ =20 #include #include -#include +#include #include #include #include diff --git a/include/linux/psi_types.h b/include/linux/psi_types.h index 8af6452b36e2..de72dcc6e0bf 100644 --- a/include/linux/psi_types.h +++ b/include/linux/psi_types.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include =20 #ifdef CONFIG_PSI =20 diff --git a/include/linux/relay.h b/include/linux/relay.h index d33735edc3cb..79ecc446ed48 100644 --- a/include/linux/relay.h +++ b/include/linux/relay.h @@ -13,7 +13,7 @@ =20 #include #include -#include +#include #include #include #include diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index d1c42219429c..4b1f01916825 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -3,7 +3,7 @@ #define __LINUX_RTNETLINK_H =20 #include -#include +#include #include #include =20 diff --git a/include/linux/sbitmap.h b/include/linux/sbitmap.h index d7d3fba174f8..f7279f7632fe 100644 --- a/include/linux/sbitmap.h +++ b/include/linux/sbitmap.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include =20 struct seq_file; =20 diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_= pipe_fs.h index c26733d8fde7..3f4d6fc0a8a3 100644 --- a/include/linux/sunrpc/rpc_pipe_fs.h +++ b/include/linux/sunrpc/rpc_pipe_fs.h @@ -4,7 +4,7 @@ =20 #include #include -#include +#include =20 struct rpc_pipe_dir_head { struct list_head pdh_entries; diff --git a/include/linux/syslog.h b/include/linux/syslog.h index 955f80e34d4f..2a4c9199d718 100644 --- a/include/linux/syslog.h +++ b/include/linux/syslog.h @@ -8,7 +8,7 @@ #ifndef _LINUX_SYSLOG_H #define _LINUX_SYSLOG_H =20 -#include +#include =20 /* Close the log. Currently a NOP. */ #define SYSLOG_ACTION_CLOSE 0 diff --git a/include/linux/tty_port.h b/include/linux/tty_port.h index a76a5b6a5cf2..8622638452cb 100644 --- a/include/linux/tty_port.h +++ b/include/linux/tty_port.h @@ -6,7 +6,7 @@ #include #include #include -#include +#include =20 struct attribute_group; struct tty_driver; diff --git a/include/linux/wait.h b/include/linux/wait.h index 8aa3372f21a0..b36000bb012c 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h @@ -4,17 +4,12 @@ /* * Linux wait queue related types and methods */ -#include +#include #include #include =20 #include =20 -typedef struct wait_queue_entry wait_queue_entry_t; - -typedef int (*wait_queue_func_t)(struct wait_queue_entry *wq_entry, unsign= ed mode, int flags, void *key); -int default_wake_function(struct wait_queue_entry *wq_entry, unsigned mode= , int flags, void *key); - /* wait_queue_entry::flags */ #define WQ_FLAG_EXCLUSIVE 0x01 #define WQ_FLAG_WOKEN 0x02 @@ -22,22 +17,6 @@ int default_wake_function(struct wait_queue_entry *wq_en= try, unsigned mode, int #define WQ_FLAG_DONE 0x08 #define WQ_FLAG_PRIORITY 0x10 =20 -/* - * A single wait-queue entry structure: - */ -struct wait_queue_entry { - unsigned int flags; - void *private; - wait_queue_func_t func; - struct list_head entry; -}; - -struct wait_queue_head { - spinlock_t lock; - struct list_head head; -}; -typedef struct wait_queue_head wait_queue_head_t; - struct task_struct; =20 /* diff --git a/include/linux/wait_bit.h b/include/linux/wait_bit.h index 96c90fbcf652..514f68eff79d 100644 --- a/include/linux/wait_bit.h +++ b/include/linux/wait_bit.h @@ -8,7 +8,7 @@ #include #include // for __init #include // for might_sleep() -#include +#include =20 struct wait_bit_key { void *flags; diff --git a/include/linux/wait_types.h b/include/linux/wait_types.h new file mode 100644 index 000000000000..4b43e7bc6dac --- /dev/null +++ b/include/linux/wait_types.h @@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_WAIT_TYPES_H +#define _LINUX_WAIT_TYPES_H +/* + * Linux wait queue related types and methods + */ +#include +#include + +typedef struct wait_queue_entry wait_queue_entry_t; + +typedef int (*wait_queue_func_t)(struct wait_queue_entry *wq_entry, unsign= ed mode, int flags, void *key); +int default_wake_function(struct wait_queue_entry *wq_entry, unsigned mode= , int flags, void *key); + +/* + * A single wait-queue entry structure: + */ +struct wait_queue_entry { + unsigned int flags; + void *private; + wait_queue_func_t func; + struct list_head entry; +}; + +struct wait_queue_head { + spinlock_t lock; + struct list_head head; +}; +typedef struct wait_queue_head wait_queue_head_t; + +#endif /* _LINUX_WAIT_TYPES_H */ diff --git a/include/media/dvb_ringbuffer.h b/include/media/dvb_ringbuffer.h index 131997d1f131..22da81bff624 100644 --- a/include/media/dvb_ringbuffer.h +++ b/include/media/dvb_ringbuffer.h @@ -24,7 +24,7 @@ #define _DVB_RINGBUFFER_H_ =20 #include -#include +#include =20 /** * struct dvb_ringbuffer - Describes a ring buffer used at DVB framework diff --git a/include/net/smc.h b/include/net/smc.h index 44a01bd3da10..92611a9cf0e9 100644 --- a/include/net/smc.h +++ b/include/net/smc.h @@ -13,7 +13,7 @@ =20 #include #include -#include +#include #include "linux/ism.h" =20 struct device; diff --git a/include/net/sock.h b/include/net/sock.h index bebdc45cf622..008a6c5a3bfc 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h index 01f13729ad24..d30e65c5f137 100644 --- a/include/scsi/libiscsi.h +++ b/include/scsi/libiscsi.h @@ -11,7 +11,7 @@ #define LIBISCSI_H =20 #include -#include +#include #include #include #include diff --git a/include/sound/control.h b/include/sound/control.h index 9a4f4f7138da..b921cdb94082 100644 --- a/include/sound/control.h +++ b/include/sound/control.h @@ -7,7 +7,7 @@ * Copyright (c) by Jaroslav Kysela */ =20 -#include +#include #include #include =20 diff --git a/include/sound/rawmidi.h b/include/sound/rawmidi.h index 46678a38dbb9..6c380196bff4 100644 --- a/include/sound/rawmidi.h +++ b/include/sound/rawmidi.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include --=20 2.39.2