From patchwork Sun Feb 11 12:29:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Kellermann X-Patchwork-Id: 199412 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp1901208dyd; Sun, 11 Feb 2024 04:30:44 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXCUGptzbyX21dygR7ntxdkHJ7rzfrcpPvH6J0L3CTJO7Vwrib6QPXnHTmAdtZUb9XBrfyLK1KiPakEYQSrOWqL6t8jNQ== X-Google-Smtp-Source: AGHT+IEq2DYQLIq1dfWNUmjjolhRe/n3g4WDd3WuX3pvhWlYtxWQ4cQAyE99DymMmtVlgPVu+geN X-Received: by 2002:a05:6a00:4588:b0:6db:e366:53a8 with SMTP id it8-20020a056a00458800b006dbe36653a8mr5314672pfb.12.1707654644043; Sun, 11 Feb 2024 04:30:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707654644; cv=pass; d=google.com; s=arc-20160816; b=FchEqSyXBY6Xe2YQRD/kaFmqqc2vQTkhztrQZjJC+SnXEhgoJYXt1I2Y/kbDVd2Jas 0cU2J0N0IywgxkGGVDUg3S6DtOvlxMIXxROw12ZTmDC/mgD5+pP6OZwaKde3tYStOLvj X2DNHWLsEzKUEgbptqeVqgXYyxqLhY8NGM0mggNr6swlx3rijQdLti72BboYucKwgKmj 49SWC8arcpxUqN62uOY9omAWQQFYxEuNLIxLKsHJ6xSRzpN6n9Ays/8bdlQp+vTI2UYG rwKJj7Fz9E0vPmceGPLGHSLWoWWopu0WBcI2XPyRLiVMYZ9OExu6WETyOgK3aZv0mwR1 wKUg== 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=Vw9lGRz3+RHq03cU6+c8b0TozV5Ez8dGFVyHUWpl4wQ=; b=I2Bk2cN39SrbwmJox+/utOUA0VmTrzripUlsFsZV1JQNxSzRpYkcgDiltk6VwnWhCX WmvHdRHvysoyJbnZ3zp2oOYDYQFH6aM0W5srG40Zw833l64UFjgEx6GIIfNMHFOxZioc qFWR+KMXN153ENpuhX9mkGGIZiAIcLKMUAvpJVgEWUmGFnawAjGbvkuX5CslsdLXzchv o1EuV4jNmTo2mhuvFBoZpfFvavtv3VjGzRyzr+q5wROL0Lefz3q13i2uJTFn5lMYjltE POoWYhnEr0CB9g0gEvn8loAzxOerABCmINpiO6UBLAHyY8qAuZVDR46OyFFXdq/MD4dh l3UA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b=QrOoYnZq; 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-60730-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60730-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ionos.com X-Forwarded-Encrypted: i=2; AJvYcCUw1ZztTh5V8FjlSXLpMbjv8GoHRsiX3URvt43wzKjCvRu1aCWpudiEkQIZmSxqM9cJ+58kMOK1X1M7UYmIRsHqJ9j99w== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id r144-20020a632b96000000b005c658bf30aasi4856643pgr.412.2024.02.11.04.30.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 04:30:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-60730-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=QrOoYnZq; 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-60730-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60730-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 C60E6281265 for ; Sun, 11 Feb 2024 12:30:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6FB595B5AD; Sun, 11 Feb 2024 12:30:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b="QrOoYnZq" Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) (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 32A0E44C73 for ; Sun, 11 Feb 2024 12:30:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707654619; cv=none; b=FujtyEa6Pl+zaaTOEfy36qVTfCLv+sxVEMUCkWQOmFpJr9yAL+iAySeC33c0luaMky68IkpbOdllaL1fCV+odPBxJYResstibmTk++vhffAbzvQvsqNispATdv7Kt5JmwY3uOMkL05eYDPRyzup8I9sexWyGZBchwalKBNEbBrk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707654619; c=relaxed/simple; bh=SghTqgxhqgon/LpOV1LOZnYIRKxGEdDsUDI6nOEWbfQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=aCOzHuhLGKF1XQgLT2apANq1y0O+Hol775xPklMvGaGvJUVYejZCnfVyz5Pv3cT2bU+nc6RDr9tsErNMAlh14+49Z7nfNd0ZI8/efx46laKMxhcR7fBXHTrn/jN00QDUiCWHvIyMr0nghBHVu53VzUhQebazkCPAGcM0wW82vdo= 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=QrOoYnZq; arc=none smtp.client-ip=209.85.208.48 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-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-55a035669d5so3436305a12.2 for ; Sun, 11 Feb 2024 04:30:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1707654614; x=1708259414; 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=QrOoYnZqwst05KLclhuF0wdkOQxppZQO7V2CP7AZt4O7MP4KvQxG6nDPfPqhKF4097 DJvaztw22Chjkxpcqxa2eeeDwuA/GLbBQCWndd8KtHx7v/f62/uLgt38ebAKjbdVeCOd UPdklEZT0uG7Su0qvQjiObKiYBA1ZGOy2Bp7tHz91BtzBC1xRfdZf/w/Dx5WHuSIbugY S3Eba3F2Zs0pfQSOEmGxIb/j6nCmglmqpI6ysv4mPDfKyX7u8CRYZlh9SuU0y3+r5uCq sBh6aeodABMFWr/uAA5TOyiKTCeSkI8AiRnea9v6t8lql5mKHXO0EN6yzyGWYRbQbFMX 0CrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707654614; x=1708259414; 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=olkigWFNnJyIbPG/iHEk8m65fiRWJPoQwaMtU+gBHh0qLOQdJDSlTFXT5tfnyO6oL4 UrOi1AuGW8VjqCyo2Rq2t7ueS19HXltObWQ6wT3oND2pvV1hdT2Ql3EAKQ4rkZ9gc98c F5aPSDAFgk+M4QlSzp0dPMCvovzeiaUa/ySy2LCuDv3yAj3a8x6xMPDLu9oaraQMuDEM 8Ye1hPB1mAMSma75pivTFc9RNQnBkhTOjQ1uWsrn/a5QRokBNizrns2cX7aKhdMPyF0n xE1wz5VrLjdj2MrUHJUr/2fBywOPJ/Xugr8MWqbnhpqt6fVF3ey8W67f20SNQy5TmWeu 3pJw== X-Gm-Message-State: AOJu0YzQqF8FnjVvrQ090otKwaLtoaEEPs/DUY4uW3VMy7elXmXT6qfP 7l2bYGDU244ON//XMUUMdOPZR+Q+9hNNxV2WAz3JtdgC87+Way8sXD2z41bLegewS00zm1o4HU5 G X-Received: by 2002:a05:6402:292:b0:561:2711:68cd with SMTP id l18-20020a056402029200b00561271168cdmr2447456edv.3.1707654614102; Sun, 11 Feb 2024 04:30:14 -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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 04:30:13 -0800 (PST) From: Max Kellermann To: linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH v3 04/35] workqueue.h: move struct delayed_work to workqueue_types.h Date: Sun, 11 Feb 2024 13:29:29 +0100 Message-Id: <20240211123000.3359365-5-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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790605675948438021 X-GMAIL-MSGID: 1790605675948438021 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