From patchwork Sun Feb 11 23:14:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Kellermann X-Patchwork-Id: 199548 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp2143824dyd; Sun, 11 Feb 2024 15:23:36 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCX+R75JKvZKTE8NyL2mlnk/AmNGZZHNMZ8vf3KKWT/KZ1SST72WwGh3OmUwMm46G2ff5E2qnrpyBmn6/6GARdraG8lTxw== X-Google-Smtp-Source: AGHT+IEIzYGf23O8nGrI/JFwQGt4NjjptXJiEv5xKsgbctnP08x0xilz2QCIhIPDwoaqEiKqu0gW X-Received: by 2002:a17:902:e74f:b0:1d9:b3ef:8331 with SMTP id p15-20020a170902e74f00b001d9b3ef8331mr4403620plf.3.1707693816352; Sun, 11 Feb 2024 15:23:36 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707693816; cv=pass; d=google.com; s=arc-20160816; b=w4b0Z4Tho72us948vD8P2ICTI6hrfE1ZmO00W38dJyEsrg+NNWQIbEjncJRXgh5gSI w3utuaXT745LoFB0WcUV3wr8aUmrVZshLTPRvYKBK1W8d3DNSRj7e+HlZ8CZ320HUQWb Nwm6bxI8XU2RtKJ7WjVep1XDSHFlFK7sk6q+rIJtHyEldawoZzdhXobcdTPcyd6md9lk mp64i5rQ+6P5+xOVihcQU8zXLwI4/jkuVqgGAiQTh0jQshSoPR4M09hnVHY9sMks27pw GhusmT1JO/4pBMBVZwiV6CzgqVUeONqcLbaSMcvvsnwT3DY81z0iwZ5uPBxc00MfX/dn n6sA== ARC-Message-Signature: i=2; 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=OTJVQKhBTkCCcRGvhQiMHvkmUke5OhffbI8haRgPHik=; fh=4CzlEDA7qbTRhMzOETL/FGKf7yqUv+r9/Qr1zbVbuTs=; b=hYR/fv/vM2MpLFJ7Ud1U5trxyrZMnV3lqU1+7KYkc3a+eUrZg6E7SRyWOacVqRNdZP uec5ve1PzBRtDuZngAVCTewemYcIpFUqPOqF+nSvz+/8fxImZKnH2NijYEnXup4VG9HC a7Ud+65K3mEJKovuOHwhqIGYDPXrCvXWimJ4APgTBl2Dify2vK+4hJVyw+r9cdB80Roa tSdZFymW5OVPNgEjSCcfIekP0BdRm0vwpXJcWbdGe8L/9guIlGTrSVEyhSJuEIDkrOJZ Ba+GjjQl4mYk/dndMUGV7sk9gxwEPPhTqkxftpYHL97zS4d+IqTMJ+AtUCzBCaAS4Afa ZNVQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b=EIbxJ1UJ; arc=pass (i=1 spf=pass spfdomain=ionos.com dkim=pass dkdomain=ionos.com dmarc=pass fromdomain=ionos.com); spf=pass (google.com: domain of linux-kernel+bounces-60995-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60995-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ionos.com X-Forwarded-Encrypted: i=2; AJvYcCVqJb73vi9iTgxSg6UzeOSoM/s/VztWyWOBDOvMgPCSBRAIkhq6kFFBdw4RNyvnjR9Rq6CR1PiZrUziMu25/OhcIN7WKw== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id iy17-20020a170903131100b001d06d5f9533si5278352plb.619.2024.02.11.15.23.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 15:23:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-60995-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b=EIbxJ1UJ; arc=pass (i=1 spf=pass spfdomain=ionos.com dkim=pass dkdomain=ionos.com dmarc=pass fromdomain=ionos.com); spf=pass (google.com: domain of linux-kernel+bounces-60995-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60995-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ionos.com 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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 278A6B2147B for ; Sun, 11 Feb 2024 23:20:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1E48739FCB; Sun, 11 Feb 2024 23:16:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b="EIbxJ1UJ" Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) (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 C6CC8179B7 for ; Sun, 11 Feb 2024 23:15:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707693351; cv=none; b=X92es+7c7untUa5/eg5xGD2thmFwm88WBj86l4hlCHbymWYSyp11I+mafjNQHuZDyF1oFzGpD8sOED5GUy3sv68+KejnoBJES6mrLZ9rRLtDZpGMOxHiCbxZSbpBGNUg/Dm/9V/n/xsQHZ6AhA2qBhMRwczW+X9HTQZWVaS/7A0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707693351; c=relaxed/simple; bh=JQYxptJhqO5awjGqkfmWG6XGmLeDv7O1QFbH3PdEe64=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MFH1TeruDXlNprJnTK83GzN3vAmIWl1qnE+RRMp0lQaapBHBPklasN/lUFV8+Uo+470rv5+Lo7f9XxWNHT2nzs/fbzkTMIMaeXL8jd7Uyr7xB4u/P5AxkSMUTjhPu9NxbHxwr6nzEiEmZ8tYZX2xNXV3sdwV0B0lmDwgzMTcxDA= 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=EIbxJ1UJ; arc=none smtp.client-ip=209.85.208.169 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 Received: by mail-lj1-f169.google.com with SMTP id 38308e7fff4ca-2d094bc2244so32569901fa.1 for ; Sun, 11 Feb 2024 15:15:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1707693345; x=1708298145; 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=EIbxJ1UJAf6J14hh7gcJqDztxqgt/jbwNFiPwQYR002R17vbKy9eNP6Ctsf74CoM2B A+aKWDkAIRk/iJGSQCQAzx1KtCo+EafnEeRXsaV0sArnB1c1RsG+RLsc5dDXeaZi7akG oSGgz4qL2VAMK7TxW17OqY4eYpu+LJedU8ThLhQ4PguNpVD6al/pj+5ySJ9q3eQ8sNCc wxNQPGSPEW6+QFM9O4lDJGmW57uW/tgpayi6ClmrjN/hSpmESovkqxnl9rb20d1HsilR nMZkIiu0WMniFMOqJROb0qimggbMst1SiyqtLG/jfhkyah1pqv+EMGpFobagd2h+3P1i Txfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707693345; x=1708298145; 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=DB3fMb8bs/6Rd5LUkw3SIsieq3t52ErP4R65POM5teQExjQ+pdsoymR1N9Vb5MKzXf r7FFdLGa1E01u+F0a5xucCmGVurnMCVyK/9dSTY9u2VBmm4FFy5NnbyCFtgS1K8KGqjt ak1K/HbISzOctwBk0eblcNFPd2Zxq4aFS0G+CNHh8v2P9chZP7mHnlg6mwCUJjOdXgWt B0EugNdaSPNnh3qgfcKgxGfpSIfjVBsGeVwqMbABzzamT98V+vVswvIGDD2IOVRT5kp6 jPPeW9F3sMrYbpVoclyi0J5zJomHp5QQdgGW0stLYpJcHInm1A4CkLplCxIGVqADeLVV gzkw== X-Gm-Message-State: AOJu0Yz3ATmZDq6w29kJmnccD6Pm3/5BKTP8TZ7RNdSL9gPluzqFzkoC 1Kz6zLz0Rn1Ca3fWAhTta7eNXvujQvXxmCYG6ZNpQ/C8yR56FDrXJCbwswbaVMdLINWWJ8sIgFy T X-Received: by 2002:a2e:804b:0:b0:2d0:f8a1:d9cd with SMTP id p11-20020a2e804b000000b002d0f8a1d9cdmr776120ljg.23.1707693345508; Sun, 11 Feb 2024 15:15:45 -0800 (PST) Received: from raven.blarg.de (p200300dc6f267100023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f26:7100:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id et13-20020a056402378d00b0055d19c9daf2sm2170180edb.15.2024.02.11.15.15.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 15:15:45 -0800 (PST) From: Max Kellermann To: linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH v4 13/35] wait.h: move declarations to wait_types.h Date: Mon, 12 Feb 2024 00:14:56 +0100 Message-Id: <20240211231518.349442-14-max.kellermann@ionos.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240211231518.349442-1-max.kellermann@ionos.com> References: <20240211231518.349442-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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790646751501210383 X-GMAIL-MSGID: 1790646751501210383 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/amdgpu/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__ #include -#include +#include /* 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 #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-defs.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 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 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 -#include +#include #include #include 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 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 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 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 -#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 struct gnss_device; 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 struct ps2dev; 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 -#include +#include #include #include 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 -#include +#include #include 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 #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 @@ #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 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 /* * 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 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 @@ #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 #ifdef CONFIG_PSI 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 @@ #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 #include -#include +#include #include #include 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 struct seq_file; 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 @@ #include #include -#include +#include 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 -#include +#include /* 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 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 #include -typedef struct wait_queue_entry wait_queue_entry_t; - -typedef int (*wait_queue_func_t)(struct wait_queue_entry *wq_entry, unsigned 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_entry, unsigned mode, int #define WQ_FLAG_DONE 0x08 #define WQ_FLAG_PRIORITY 0x10 -/* - * 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; /* 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 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, unsigned 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_ #include -#include +#include /** * 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 @@ #include #include -#include +#include #include "linux/ism.h" 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 #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 */ -#include +#include #include #include 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