From patchwork Wed Jan 31 14:49:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Kellermann X-Patchwork-Id: 194814 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1961860dyb; Wed, 31 Jan 2024 07:22:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IF1R44t72L2oMYqZUWIZqIjeIpwi0KZhCbM9jrnMivyvVCp+4+g3uDY3rv8af1Rc/qdbVoT X-Received: by 2002:a05:6402:1c99:b0:55f:aa:12a7 with SMTP id cy25-20020a0564021c9900b0055f00aa12a7mr1324543edb.16.1706714550223; Wed, 31 Jan 2024 07:22:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706714550; cv=pass; d=google.com; s=arc-20160816; b=Z1ku5mvUvkW1r3RJixeOFnAf4ttOnKYT3a7guv45NtvqVaSd/zHVp23blaJ6gYG30m PTKRLdCcY4ufI7DbKSByKSsb01LnuAxjby1gDqSBbfi1xeP1xaHlHMk9wJwhC3/T9Fe2 FA8BUfYWw8BImAtqATxgHujo9URJwMXEZJSVoL0oZJDoVQs5lBJ/5gFgsaBen1x0ea8N hUG7nKSilhGFh+W9dESqMcsx2OXnwDAXwq9/BIjAil+CM+SR5kyBYfXO4Mw5JxqgtzIa TwZvpNI/FXimHi9AEbOjjveCbA8Vlp+M5qGOGQMBLmbd/uHq0L2rFQIEhTy8hGJ9OQRL S3rQ== 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=h59UYzvy6kpxTaWQxJXzjWALnlqX8AK9QZK5PYncxLY=; fh=HvwvLawGn/wfGjqPbbUvefCuJzAxDA7mM2euC4BULuU=; b=yODZ3CMMRP5PGFX9G05ijDYdvftK64t4Ln2fQTFou3KeB0Pbdp/nbzwcWdoq4G4jPQ Ct82Zw7Gm2J4rorDxOOTJy3Is4/8FsfjCO1dNcOFR6n8ks7sXGBStoP5o6YzS9/0Tudm eLbKkgok3zRnBdzgKcd/MOWUFmvbJ58LOpHyYJFOdWw3lWlm1ypuKv+3u87mVopgJr3n dBpsbTI7UcdP5bKVqOZnYFEguK6DWhe2NjvxAMZdQ9x4dltTX7qZlTM5jEyeAeKpexKD sGjohqNbCwPKV0/6BxhyaZNncuOK1GBpe/oGF/uuNz9E3aVVxgnLLcL7Fm+ybAvpfEqf q2+g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b=aYlr81CM; 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-46646-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-46646-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ionos.com X-Forwarded-Encrypted: i=1; AJvYcCWCE3kXJrZRiQB2vb0EBKlI8YUUyn0XsiIB7Y/cZFxnOGorXHm3uiiVQRmpeEhVyXrbEVwW2wMrLlL2nCuG/moXtW3znA== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id e22-20020a50d4d6000000b0055f2831bd6dsi2405435edj.164.2024.01.31.07.22.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jan 2024 07:22:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-46646-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=@ionos.com header.s=google header.b=aYlr81CM; 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-46646-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-46646-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 3C2F31F2135A for ; Wed, 31 Jan 2024 14:56:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 324F312F5AC; Wed, 31 Jan 2024 14:50:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b="aYlr81CM" Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.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 E96B312BF01 for ; Wed, 31 Jan 2024 14:50:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706712632; cv=none; b=HIAqDCaw+cCa0TEMJDlRpsjY07tn7pUe9XbLui25rcEmCmeryWVDTc8pACOJ4kJl1j4/r5oVH3XphGkcn/+60guenI0cYyHagTZg+iHJRoaIlU6CyU8rKQIN9stDqLwjxyWGClzr86yS2CoCJfq13W1VUcKsIys9yIe+jlywe9U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706712632; c=relaxed/simple; bh=iPCyZ2KUwOFgyUzIGaDQfCAYR/4Sl5SIrrt7kLBaXS8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OFM6Iea4K54126IR5wg7xdVYO+AO06Nm7VvGTS7ls9nsKrU27OA2jOw3TKH5exyU0UUvqF2ZYzv9b+mbfyVJBEG+vDJ525jjQ5HeY1QAK2kO4Hg0eZZYTdTBzgR42ryQ92P6Cs9jzwFkxpD/TW7lrU1/Z9Ugrn6cMtjUaaGxKTU= 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=aYlr81CM; arc=none smtp.client-ip=209.85.221.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 Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-33afcfc40e2so1175432f8f.0 for ; Wed, 31 Jan 2024 06:50:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1706712627; x=1707317427; 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=h59UYzvy6kpxTaWQxJXzjWALnlqX8AK9QZK5PYncxLY=; b=aYlr81CMiILyg8NoAsMCOW1KwmEEmDymlJrG6LDifVTlgBjzyh1pgPsE0o+ecYUQ8v YwhZ2JBzgw4MOD2Bwxhr8k60aKisW0lFyYHG/8iEd15+EQciEwRHR64ZIz8QaTy02lyZ 8EJq12xR33BGUn+l/XSM8Cn2wdm+UKFkaqDM7jqYapu2ltHB4Gx6oJlOM/8PAQn/ZvCh a+uZBmMiFW95woTdA1Sq3+7hwQCpB2Ly9KFN3SWThBTTvGU43J3mhxfoduO3IEJIx3MF IO1ORtgEyOknCUmwop9rEZYgp8MRdpfzS8yjzkDA58QVt4T9FZW9972xtA/WvEfw1/YY SZUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706712627; x=1707317427; 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=h59UYzvy6kpxTaWQxJXzjWALnlqX8AK9QZK5PYncxLY=; b=hfrLXFXaDTUMqgJFTq8sqQcK3fhM6GeJdILwjpGkXfOleYTFwK8P7Gu/DrAOWif/tW ZNXZD0SKZVUusoKtoOWH9me8VrTbDY/owSDyO/KDfaHI/rGp9b4EAY1ndeRyW9Iw8wSj kTrf1jietUG3uN8a1UsNrXTY9d1M/L9spC+0ZzQlBR/QKXYf0uEiUDgELPzu6NdLJt1i ZO8iWtJ8Zl2VX4xrj0dTfJQuVNca5/2Z8SoZtwi2XM65VeG4iiN4VsIHS9nLDpY6XaKL KHzAV8PVt10Z4/6MSbyWrAR4ZjxMgnn649raHYVC69Q44WLCGIdw4Omiz7HRFsounzSJ cbFQ== X-Gm-Message-State: AOJu0YzaDmhMmpFj4ohEXg/tC+IX28LMbcBK9FfmWTsvML8jxDAo3grd AyZaSktKTgZYyCruejFFDWyDuF6e0rh53h5h77bdHpxm8J8QIAmxihwdn9ZH0N2iRev+wVwJv0J g X-Received: by 2002:a5d:42c3:0:b0:33a:fc59:91c1 with SMTP id t3-20020a5d42c3000000b0033afc5991c1mr1272273wrr.18.1706712626654; Wed, 31 Jan 2024 06:50:26 -0800 (PST) Received: from raven.blarg.de (p200300dc6f2f5c00023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f2f:5c00:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id ch15-20020a5d5d0f000000b0033905a60689sm13850173wrb.45.2024.01.31.06.50.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jan 2024 06:50:26 -0800 (PST) From: Max Kellermann To: linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH 13/28] wait.h: move declarations to wait_types.h Date: Wed, 31 Jan 2024 15:49:53 +0100 Message-Id: <20240131145008.1345531-14-max.kellermann@ionos.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240131145008.1345531-1-max.kellermann@ionos.com> References: <20240131145008.1345531-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: 1789619915971884866 X-GMAIL-MSGID: 1789619915971884866 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/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 +- 39 files changed, 69 insertions(+), 59 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 ec4940fcc489..3a14de75286a 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 a2d39fef6a4a..cbfc0f6c468d 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 e32bee4345fb..e021a18f53b5 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 7be1e32e6d42..ea9cfabd9897 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 e6a041cb8bac..585886644e3d 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 f94a78728f1e..14f95d7e67ab 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -12,7 +12,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 904cf20a7ae6..0cce3f1a73d6 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/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