From patchwork Tue Aug 8 08:59:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 132686 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2319734vqr; Tue, 8 Aug 2023 11:37:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJE/BuuneSewk49lq5PUqzcA/b0FE6YyeNDWsvs7Fw6Tno7IKyZ9U7h8XaDR3zeTH84FVQ X-Received: by 2002:a05:6512:2342:b0:4fd:d18e:be33 with SMTP id p2-20020a056512234200b004fdd18ebe33mr294493lfu.26.1691519832997; Tue, 08 Aug 2023 11:37:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691519832; cv=none; d=google.com; s=arc-20160816; b=hQnu+GU4ylQbzbyOkBrI83hw5v3cGOWZWOMQM2v7zDhG5obKkYwYcvdPkh7J5sc1KM ecNmUG/APNiO2zoMgqFuSzQs8hMvREyio5mrHfjSjO8HtB4g63UVXPFfx0Lupoi1JQ64 /hzIGGQHxvLxkfSoDP6oYBPv+gYCmE0mbrs16NB3ug5tKLOC6NHoy7GVH+zvwO7RJLYl i+YCrdxzq1QZnyugvUnuervLQKDfKafdThPksqRvZKCZZQ6Zo3uM4XYsznDaw9hRxQj3 Vp7qu/nwNCdk69XQiR8gd8+jVkkcSmtiyt7nUx4kewRD8wG2/kDE9XsmNiediDtOf1NU uoYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=mRTAJBEqdoIqtU1fMTNa9ss/qzISSuT9FpyeLJjVRzs=; fh=QK4Rx/iltTE6r/iPgcH6MuxAYqqFe0yLyrlkpH28NYo=; b=JvNKLVPzWf5VLm2v9/txUicNouJaAqvo7JuvasfDTZP84/Ks8nOC2SrvxoxeTIQp5a qN7vtbwjaYOXjZS6o/ddxCAB7ArJ+vEiVk06ymS3cOR0dw9V1+Kl3u/vrKTMt/fVShr3 Ewy0tCvtle3GiDN40r/+bAB5rm05c6cI2yHoIPz4N3aTDApMK4GAJCDJSgimWh2ZPb5x eNtblGLtn9fPQ8tdgfDrtXUeAiNJ2ucjR1o5lfkpJpWJrrIsBQ9iml/H89VSJ9ALQc8r Zccg2OqOS0yu00HiWmbAHKmelUpIiYgtaf0iMWZP02TwUHNKVaor3vUJywgSuZt0SV2y jxbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=JZ5uwZHI; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d4-20020aa7d5c4000000b00522de11e513si7586152eds.500.2023.08.08.11.36.48; Tue, 08 Aug 2023 11:37:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=JZ5uwZHI; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231836AbjHHRQH (ORCPT + 99 others); Tue, 8 Aug 2023 13:16:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233090AbjHHRPV (ORCPT ); Tue, 8 Aug 2023 13:15:21 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 649762D5B; Tue, 8 Aug 2023 09:06:18 -0700 (PDT) Date: Tue, 08 Aug 2023 08:59:15 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691485156; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mRTAJBEqdoIqtU1fMTNa9ss/qzISSuT9FpyeLJjVRzs=; b=JZ5uwZHIcQwKkYH1TBRgIRa1c91CxdUiA/o4NovsnqNDZGMuG9b5LxAIUyFn79PZneDkss DLrDVIhGtQYU5dgJ/yl4OO75GdrCN6evDqbtBGumnpQkMfyZd6sO9EConBZ4deDzqADGbb 2Z0oSHa0VdXnvxttH/dswYcqyIXPE0afjNuYDITR7DUNXPCAqzXruDXpeor6D+V5og5J5M lt+1jIIFl90DF2j2W395iJDNs3f1IucaRhRnETI+HRWYWBDJmVAI9PvmMDTZbTZl5hoeBT sU9hlhMtSZKtTokkm8DJpDIth18+3JQc2tTvIu6AsA+cxc7cmluW38VgnYWsLA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691485156; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mRTAJBEqdoIqtU1fMTNa9ss/qzISSuT9FpyeLJjVRzs=; b=apP4cgbaxuJ2fNBJJ1eYz3lmKZQVlnhDae/HKCLkAFAXTKSIROQytcsvaTsu5BpRUEF8pk 5Uj7ZvjWJLlSaQBw== From: "tip-bot2 for Anna-Maria Behnsen" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: smp/core] Documentation: core-api/cpuhotplug: Fix state names Cc: "Anna-Maria Behnsen" , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230515162038.62703-1-anna-maria@linutronix.de> References: <20230515162038.62703-1-anna-maria@linutronix.de> MIME-Version: 1.0 Message-ID: <169148515588.27769.11927101338682187648.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DATE_IN_PAST_06_12, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1765978570677291714 X-GMAIL-MSGID: 1773687100230129178 The following commit has been merged into the smp/core branch of tip: Commit-ID: e0a99a839f04c90bf9f16919997c4b34f9c8f1f0 Gitweb: https://git.kernel.org/tip/e0a99a839f04c90bf9f16919997c4b34f9c8f1f0 Author: Anna-Maria Behnsen AuthorDate: Mon, 15 May 2023 18:20:38 +02:00 Committer: Thomas Gleixner CommitterDate: Tue, 08 Aug 2023 10:55:58 +02:00 Documentation: core-api/cpuhotplug: Fix state names Dynamic allocated hotplug states in documentation and the comment above cpuhp_state enum do not match the code. To not get confused by wrong documentation, change to proper state names. Signed-off-by: Anna-Maria Behnsen Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/20230515162038.62703-1-anna-maria@linutronix.de --- Documentation/core-api/cpu_hotplug.rst | 10 +++++----- include/linux/cpuhotplug.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/core-api/cpu_hotplug.rst b/Documentation/core-api/cpu_hotplug.rst index e6f5bc3..b9ae591 100644 --- a/Documentation/core-api/cpu_hotplug.rst +++ b/Documentation/core-api/cpu_hotplug.rst @@ -395,8 +395,8 @@ multi-instance state the following function is available: * cpuhp_setup_state_multi(state, name, startup, teardown) The @state argument is either a statically allocated state or one of the -constants for dynamically allocated states - CPUHP_PREPARE_DYN, -CPUHP_ONLINE_DYN - depending on the state section (PREPARE, ONLINE) for +constants for dynamically allocated states - CPUHP_BP_PREPARE_DYN, +CPUHP_AP_ONLINE_DYN - depending on the state section (PREPARE, ONLINE) for which a dynamic state should be allocated. The @name argument is used for sysfs output and for instrumentation. The @@ -588,7 +588,7 @@ notifications on online and offline operations:: Setup and teardown a dynamically allocated state in the ONLINE section for notifications on offline operations:: - state = cpuhp_setup_state(CPUHP_ONLINE_DYN, "subsys:offline", NULL, subsys_cpu_offline); + state = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "subsys:offline", NULL, subsys_cpu_offline); if (state < 0) return state; .... @@ -597,7 +597,7 @@ for notifications on offline operations:: Setup and teardown a dynamically allocated state in the ONLINE section for notifications on online operations without invoking the callbacks:: - state = cpuhp_setup_state_nocalls(CPUHP_ONLINE_DYN, "subsys:online", subsys_cpu_online, NULL); + state = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "subsys:online", subsys_cpu_online, NULL); if (state < 0) return state; .... @@ -606,7 +606,7 @@ for notifications on online operations without invoking the callbacks:: Setup, use and teardown a dynamically allocated multi-instance state in the ONLINE section for notifications on online and offline operation:: - state = cpuhp_setup_state_multi(CPUHP_ONLINE_DYN, "subsys:online", subsys_cpu_online, subsys_cpu_offline); + state = cpuhp_setup_state_multi(CPUHP_AP_ONLINE_DYN, "subsys:online", subsys_cpu_online, subsys_cpu_offline); if (state < 0) return state; .... diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index 25b6e6e..06dda85 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -48,7 +48,7 @@ * same section. * * If neither #1 nor #2 apply, please use the dynamic state space when - * setting up a state by using CPUHP_PREPARE_DYN or CPUHP_PREPARE_ONLINE + * setting up a state by using CPUHP_BP_PREPARE_DYN or CPUHP_AP_ONLINE_DYN * for the @state argument of the setup function. * * See Documentation/core-api/cpu_hotplug.rst for further information and