From patchwork Fri Feb 9 16:39: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: 198978 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp978121dyd; Fri, 9 Feb 2024 08:41:07 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCV1DM1/Ne/5c0fPx7gDoyVmzl+8sRJgr5ZfdipF3fv5prxb3EYDK/A0GQ3AI1yuQ1RsREPi+SN+4E6YaMniJXWiGK1/sg== X-Google-Smtp-Source: AGHT+IEuMX7vgIewA9rFOVIwltlueRqun1M31q4KXD4y7K9WC6a4Qc6hxB8rsRLJZfmYLAJxya// X-Received: by 2002:a05:6a20:c91b:b0:19c:af95:96ec with SMTP id gx27-20020a056a20c91b00b0019caf9596ecmr2461265pzb.35.1707496867759; Fri, 09 Feb 2024 08:41:07 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707496867; cv=pass; d=google.com; s=arc-20160816; b=vgVVDEU5gpm45A/ZHoIpvAeHzFT7F7bz1iHl8oY58B3ib/iXY286LMIam93+HOh/b8 OYJTSQQb/0ZWCcu1FEYNSTtuEw7XdWbvhNhtN6rTfg4pVYjlNe/v9csw8Ymg4Nn8yG1G Nal0KOSfcOi7LojFCI0pVFznf/AMv3d7we9pqu/NtPjhNUUX79z+M1pBY7vFwP8JDeDz vmF6JyjrXb7Q8a+H2G7ZCg79mO5I1h8REFHAe627jNlkkwbU7JZwgXVUEAkQ4QfUnIxV nVSHaP6kjWWl4Uiz689Z3y7LHb0K1ypEQ0xNOdqDysBkRgfLYpS2TvVBvjfSnBZbtNa3 ajYw== 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=gvmxHxgb+P9LM9n9dvePcQ7EPhhjGM1zr1ro0i5QEmI=; fh=Zy2cciZw7Cg8ucAKo4KIyY2buLS71AYwdMqCpwG1+OA=; b=R2mUjBmVdd1YD1zhNg6bOPMpcintj8RKoOPT6//LTmxR+53PdxtmbzL/L+CZc/q7d4 HUwBCAtSP4KMhV263QEsvatodCy4n32Jtpe8PhA8pEXYeMfnAmagUeqnaU5XhqKetBHI XuKkYuBWrzgtV/3MSTgGv9QPWbr2yu6JITwGvm6Nyz4IFdY328Mq1CDUuVfdnCFB/Ebk qBQHq52ZtxI7VaBUq6eolDPOfI2gL+xuYAnwJqZF8qF/OwSUEYiSsa4ZTrLmUGC1dQ0d mGdZHQlz1M4T/GH5wsK7ftzikjee0vGHWE0neoITymu6xy4SZG0Hrhlm5wi+KXC1i0mE GbTQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b=cBLxjTkg; 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-59620-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59620-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ionos.com X-Forwarded-Encrypted: i=2; AJvYcCV6RbZIsEOUTOOTWpCL7CP4DmJ/jt+5MEizRz6WzzW3zx35mQCT8VPxgdwL0ZCUFQp05NcgQkfNG/bpsmvMMFS6bcFuDw== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id cb22-20020a056a02071600b005dc4e7d879csi2200883pgb.66.2024.02.09.08.41.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 08:41:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-59620-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b=cBLxjTkg; 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-59620-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59620-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id DEDF8287C5D for ; Fri, 9 Feb 2024 16:41:06 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8533F7BAF4; Fri, 9 Feb 2024 16:40:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b="cBLxjTkg" Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) (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 539FE7B3D2 for ; Fri, 9 Feb 2024 16:40:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707496851; cv=none; b=Rg7Z1Mk6RSEIH6VvE1FVBYX9bG2XVtq2+WfaHyjkzjc9HUQspT9qe78Hb2PstbprlMcrcV2vwHUJ0Naz9dolceTo6UpIqXnX+m8zqjTo3ImImmFqbyqwjqD0/gL+MhwdViP3Xu/W3uo6Z8uYVAOSmx7ffe4KNtV0dpDZyIcMk7g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707496851; c=relaxed/simple; bh=SghTqgxhqgon/LpOV1LOZnYIRKxGEdDsUDI6nOEWbfQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YY8aqyIgaVsBKBGgKf5ds/VnT7ALGxkTpKUYLMWi3EpT5hSlHcCMniln9Xt4I7M1QhvHJCKCxKOBoEUYi7+02GNSiJyL9ke56WWUVG4VnKHFl7AHyCbJRjjn4ORfTrZxgJ+IJvG6bWfNuJRkKvPH/IRx0M04bsEHlOAGmLGu0EY= 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=cBLxjTkg; arc=none smtp.client-ip=209.85.208.179 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-f179.google.com with SMTP id 38308e7fff4ca-2d0cdbd67f0so14715021fa.3 for ; Fri, 09 Feb 2024 08:40:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1707496845; x=1708101645; 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=gvmxHxgb+P9LM9n9dvePcQ7EPhhjGM1zr1ro0i5QEmI=; b=cBLxjTkgi/dLSGah3V99danmEsDhd36/NsmiE3XSZSwhgy2nU4f4FQo8FBXRqxyo3C VNudAzQo9u9rQMVQlxtof2RSSwmNQap1CEoAsLJ0mVFcDpHEWPw+wYqobmnlv6uAp/7f bi/vAajKAAz+tcyzgSiFVXBxgohmBzLCdLbIPP3xUMi2dyNpj3DXIk+/bP7cFaY+lTAM 6wnXF1BaSvQnbN8EaqqAXwjTKSSAXZ7/Ro1+1BodMXxK/gcUWdOyeG1pD6GqqmzybU+R iyrdh6iJ26Q0vbNv8Mf5YAPlmhle04Z+Sp63g4azJF/Bhr6WAyedN8fZm9oAGOg2KUo2 F6rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707496845; x=1708101645; 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=gvmxHxgb+P9LM9n9dvePcQ7EPhhjGM1zr1ro0i5QEmI=; b=ncuQEzto+kucg0fAyHy63yU6kKVhWF1l/18G1daVDVVYpUWNvzFBOutCuycW3z9DAH BMV36hy9RpVDt5MlU3UpP1uZWL7X877ziHWp/QSyY3V1h8HVqFGOp9iYIO2Ao/+eIFmp 2I1CkfvYXFJTqSdKgI5e+DcJGJ6Dh6hj988fsSJInLPDjFf686av8BUpdNSvTWbhk74L LRY31IAR/UalrKyvc3p1PMl405XaJD8t9+vym+cjsRRd4csai+PyJC23P3GTCWjwDlR1 9eF1jRv54lxCT2uA2CGI8UDUvYESYmvFPGHVbkLYvk9n2rqqQ1cnH4a/cqKoYAX0bSKb 8uaA== X-Gm-Message-State: AOJu0YzGUrWK5aJrS9UGlzopkhZ5rxWFtOM5JG0NzAzNrV/M5bPHfwvl nhpD6Ckij4ASFTIgxTTSuMkaKU6uxDCKfACae1MCwsGkJwA2RUz+cDSz5ILTu0i75Dr23/xooe6 L X-Received: by 2002:a05:651c:11c7:b0:2d0:d05a:2135 with SMTP id z7-20020a05651c11c700b002d0d05a2135mr1400563ljo.31.1707496845016; Fri, 09 Feb 2024 08:40:45 -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 tl27-20020a170907c31b00b00a3bfe97fe27sm477724ejc.218.2024.02.09.08.40.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 08:40:44 -0800 (PST) From: Max Kellermann To: linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH v2 04/35] workqueue.h: move struct delayed_work to workqueue_types.h Date: Fri, 9 Feb 2024 17:39:56 +0100 Message-Id: <20240209164027.2582906-5-max.kellermann@ionos.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240209164027.2582906-1-max.kellermann@ionos.com> References: <20240209164027.2582906-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: 1790440235503329374 X-GMAIL-MSGID: 1790440235503329374 This allows including workqueue_types.h instead of workqueue.h in some headers. Signed-off-by: Max Kellermann --- include/linux/can/dev.h | 2 +- include/linux/jump_label_ratelimit.h | 2 +- include/linux/kobject.h | 5 ++++- include/linux/workqueue.h | 9 --------- include/linux/workqueue_types.h | 9 +++++++++ include/net/netns/ipv6.h | 2 +- include/sound/soc.h | 2 +- 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h index 332ece824fde..91cf56179c13 100644 --- a/include/linux/can/dev.h +++ b/include/linux/can/dev.h @@ -22,7 +22,7 @@ #include #include #include -#include // for struct delayed_work +#include // for struct delayed_work /* * CAN mode diff --git a/include/linux/jump_label_ratelimit.h b/include/linux/jump_label_ratelimit.h index 8c3ee291b2d8..2b5095d3dea2 100644 --- a/include/linux/jump_label_ratelimit.h +++ b/include/linux/jump_label_ratelimit.h @@ -3,7 +3,7 @@ #define _LINUX_JUMP_LABEL_RATELIMIT_H #include -#include +#include #if defined(CONFIG_JUMP_LABEL) struct static_key_deferred { diff --git a/include/linux/kobject.h b/include/linux/kobject.h index da714992ab38..8890ab7bdbdc 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -24,9 +24,12 @@ #include // for va_list #include #include -#include #include +#ifdef CONFIG_DEBUG_KOBJECT_RELEASE +#include +#endif + #define UEVENT_HELPER_PATH_LEN 256 #define UEVENT_NUM_ENVP 64 /* number of env pointers */ #define UEVENT_BUFFER_SIZE 2048 /* buffer for the variables */ diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index 4ba33cf07f11..0fbc11030ba2 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -99,15 +99,6 @@ enum wq_misc_consts { #define WORK_DATA_STATIC_INIT() \ ATOMIC_LONG_INIT((unsigned long)(WORK_STRUCT_NO_POOL | WORK_STRUCT_STATIC)) -struct delayed_work { - struct work_struct work; - struct timer_list timer; - - /* target workqueue and CPU ->timer uses to queue ->work */ - struct workqueue_struct *wq; - int cpu; -}; - struct rcu_work { struct work_struct work; struct rcu_head rcu; diff --git a/include/linux/workqueue_types.h b/include/linux/workqueue_types.h index 4c38824f3ab4..e16aaa7a6661 100644 --- a/include/linux/workqueue_types.h +++ b/include/linux/workqueue_types.h @@ -22,4 +22,13 @@ struct work_struct { #endif }; +struct delayed_work { + struct work_struct work; + struct timer_list timer; + + /* target workqueue and CPU ->timer uses to queue ->work */ + struct workqueue_struct *wq; + int cpu; +}; + #endif /* _LINUX_WORKQUEUE_TYPES_H */ diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h index 858ee28e73f9..30a55f462264 100644 --- a/include/net/netns/ipv6.h +++ b/include/net/netns/ipv6.h @@ -6,7 +6,7 @@ #include #include #include -#include // for struct delayed_work +#include // for struct delayed_work #include #ifndef __NETNS_IPV6_H__ diff --git a/include/sound/soc.h b/include/sound/soc.h index 6defc5547ff9..0021d54625da 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include