From patchwork Wed Dec 6 15:46:28 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: 174645 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp4193332vqy; Wed, 6 Dec 2023 07:46:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IHYA85xLB9rcz9DC1Ng8Erf27ISGgFYUVRttjekd4/PHuKt5jA+uj6iWDlXHmoAgDTmcgaB X-Received: by 2002:a05:6a20:bf20:b0:181:b87a:b8ba with SMTP id gc32-20020a056a20bf2000b00181b87ab8bamr898016pzb.53.1701877601515; Wed, 06 Dec 2023 07:46:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701877601; cv=none; d=google.com; s=arc-20160816; b=wozviDBrs46SVTYWL+Ao/hMt+eudwa04f8R3yT+fRiaGB9IAJ7PKq6QsBkA4xMczQE 6TteoKxGJaUXPW6H8Rb0ageBYRrSiUGbmpTSF8EIHip8nka7IpinDWNT8yNthTDPsJsW pKMOr7ELKoAszCWomiHVq/+jaxvUHZnaG7f60E52ULR1w+gRcQ+TuR+p/59ZQVbPvqJL 5wNvC+hpvTh1+BVDbCeb5gY3kV5vaDGE7sLfbKi9GOHV5PRvDjCqcvGLjGXvhMLuq2Gh 0avkxATSKciAERXy2Q9coFqn3rJl2AY/z7qGxhWgnlUiiLnvEV7kL9CJyylbMn7/3pqF hOLg== 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=xJX0tYjAGn3fmFE3b1w7KCi39uVImecXHrOoY8+UCxM=; fh=7qzV97HQjY/HAhx9vMREZQ+JAaUlBjQa/8YYGI7as2E=; b=refOW9aeTmu1TTe24x1fDOfHj0oyxq1US8sAC+CtWo1a8lv+i4WeCLEmydX+AmuBWC B7zBOlLw0/FM5qvDhCWvxKJrEPtLV7mQ48K2fAkdCplQtzLxyq5MuKGcxjW7a49AWSTa VE057p6xgiECJB8DsfZauy9F40/7dERfMbqqLUnw5HMI7OPtdxAwhzvAK6EXWp2fHQCX 7P/g0pfbtMXTjZYbSZh82LDOW9fwZI4gdZpNS9B0eyqXfqveCL4U6Mkf8adyO/STBnM/ nfwVOoW8v5L8TwfXBX1zbQikwUVs0tAtgMVDPOJE9Z2WDx9miMLTdkHcW5gNx5xjgfPe +ybA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="iyYKexP/"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id u13-20020a056a00158d00b006ce826158f0si142433pfk.111.2023.12.06.07.46.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 07:46:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="iyYKexP/"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id DFF4B805160E; Wed, 6 Dec 2023 07:46:37 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379415AbjLFPq2 (ORCPT + 99 others); Wed, 6 Dec 2023 10:46:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379288AbjLFPqZ (ORCPT ); Wed, 6 Dec 2023 10:46:25 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A874C9; Wed, 6 Dec 2023 07:46:32 -0800 (PST) Date: Wed, 06 Dec 2023 15:46:28 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1701877590; 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=xJX0tYjAGn3fmFE3b1w7KCi39uVImecXHrOoY8+UCxM=; b=iyYKexP/+hGZ8oaSAqHfbblBJOlJ3tOp6QkFqwu/S7o0WmT8aMN+Ig9Qn4k+fG+L0dkYlE gu+j59DqBbZEQUUPW7iB2uM9IUiT4We/X4aKYMVp9eO7veFjvJbn6WfFvpByldJZ0F3g5f QLDGnq77vv1ZFyI4WL/VpHdM7RD4WU/+k4EWQkoE4bta3A+Ys3IJ8JDq3lg8qEyBbhIEd+ Pm6xG+dleVWJwagmAEmElLbSA5wCA/rfTLEFzlJAIwEHdU7vPQ22vTZzbLXJXhwtkG5MMy u3hEOLv6GKKxDJv1G+e5Ef1Pp9D/iBt4AmAZyF7pPoTuNscveTokC9fNV/suyA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1701877590; 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=xJX0tYjAGn3fmFE3b1w7KCi39uVImecXHrOoY8+UCxM=; b=/A+ku8YxTnzHCtc/3htQm5bdFSmXaDn0U1sNWyoWW95PSPqEVOvQUCHKq22iN0XgwSWgBM nK9IqYLfAjawvNBg== From: "tip-bot2 for Zenghui Yu" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: smp/core] cpu/hotplug: Remove unused CPU hotplug states Cc: Zenghui Yu , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231124121615.1604-1-yuzenghui@huawei.com> References: <20231124121615.1604-1-yuzenghui@huawei.com> MIME-Version: 1.0 Message-ID: <170187758879.398.12515486860339710758.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,UPPERCASE_50_75 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Wed, 06 Dec 2023 07:46:38 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784548008084492320 X-GMAIL-MSGID: 1784548008084492320 The following commit has been merged into the smp/core branch of tip: Commit-ID: 15bece7bec0df91a8ed1c185483d67708425ca8e Gitweb: https://git.kernel.org/tip/15bece7bec0df91a8ed1c185483d67708425ca8e Author: Zenghui Yu AuthorDate: Fri, 24 Nov 2023 20:16:15 +08:00 Committer: Thomas Gleixner CommitterDate: Wed, 06 Dec 2023 16:31:03 +01:00 cpu/hotplug: Remove unused CPU hotplug states There are unused hotplug states which either have never been used or the removal of the usage did not remove the state constant. Drop them to reduce the size of the cpuhp_hp_states array. Signed-off-by: Zenghui Yu Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/20231124121615.1604-1-yuzenghui@huawei.com --- include/linux/cpuhotplug.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index efc0c0b..af6c21a 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -66,15 +66,12 @@ enum cpuhp_state { CPUHP_PERF_POWER, CPUHP_PERF_SUPERH, CPUHP_X86_HPET_DEAD, - CPUHP_X86_APB_DEAD, CPUHP_X86_MCE_DEAD, CPUHP_VIRT_NET_DEAD, CPUHP_IBMVNIC_DEAD, CPUHP_SLUB_DEAD, CPUHP_DEBUG_OBJ_DEAD, CPUHP_MM_WRITEBACK_DEAD, - /* Must be after CPUHP_MM_VMSTAT_DEAD */ - CPUHP_MM_DEMOTION_DEAD, CPUHP_MM_VMSTAT_DEAD, CPUHP_SOFTIRQ_DEAD, CPUHP_NET_MVNETA_DEAD, @@ -96,7 +93,6 @@ enum cpuhp_state { CPUHP_NET_DEV_DEAD, CPUHP_PCI_XGENE_DEAD, CPUHP_IOMMU_IOVA_DEAD, - CPUHP_LUSTRE_CFS_DEAD, CPUHP_AP_ARM_CACHE_B15_RAC_DEAD, CPUHP_PADATA_DEAD, CPUHP_AP_DTPM_CPU_DEAD, @@ -118,7 +114,6 @@ enum cpuhp_state { CPUHP_XEN_EVTCHN_PREPARE, CPUHP_ARM_SHMOBILE_SCU_PREPARE, CPUHP_SH_SH3X_PREPARE, - CPUHP_NET_FLOW_PREPARE, CPUHP_TOPOLOGY_PREPARE, CPUHP_NET_IUCV_PREPARE, CPUHP_ARM_BL_PREPARE, @@ -151,18 +146,14 @@ enum cpuhp_state { CPUHP_AP_IRQ_ARMADA_XP_STARTING, CPUHP_AP_IRQ_BCM2836_STARTING, CPUHP_AP_IRQ_MIPS_GIC_STARTING, - CPUHP_AP_IRQ_RISCV_STARTING, CPUHP_AP_IRQ_LOONGARCH_STARTING, CPUHP_AP_IRQ_SIFIVE_PLIC_STARTING, CPUHP_AP_ARM_MVEBU_COHERENCY, - CPUHP_AP_MICROCODE_LOADER, CPUHP_AP_PERF_X86_AMD_UNCORE_STARTING, CPUHP_AP_PERF_X86_STARTING, CPUHP_AP_PERF_X86_AMD_IBS_STARTING, - CPUHP_AP_PERF_X86_CQM_STARTING, CPUHP_AP_PERF_X86_CSTATE_STARTING, CPUHP_AP_PERF_XTENSA_STARTING, - CPUHP_AP_MIPS_OP_LOONGSON3_STARTING, CPUHP_AP_ARM_VFP_STARTING, CPUHP_AP_ARM64_DEBUG_MONITORS_STARTING, CPUHP_AP_PERF_ARM_HW_BREAKPOINT_STARTING, @@ -179,7 +170,6 @@ enum cpuhp_state { CPUHP_AP_QCOM_TIMER_STARTING, CPUHP_AP_TEGRA_TIMER_STARTING, CPUHP_AP_ARMADA_TIMER_STARTING, - CPUHP_AP_MARCO_TIMER_STARTING, CPUHP_AP_MIPS_GIC_TIMER_STARTING, CPUHP_AP_ARC_TIMER_STARTING, CPUHP_AP_RISCV_TIMER_STARTING, @@ -217,9 +207,7 @@ enum cpuhp_state { CPUHP_AP_PERF_X86_AMD_UNCORE_ONLINE, CPUHP_AP_PERF_X86_AMD_POWER_ONLINE, CPUHP_AP_PERF_X86_RAPL_ONLINE, - CPUHP_AP_PERF_X86_CQM_ONLINE, CPUHP_AP_PERF_X86_CSTATE_ONLINE, - CPUHP_AP_PERF_X86_IDXD_ONLINE, CPUHP_AP_PERF_S390_CF_ONLINE, CPUHP_AP_PERF_S390_SF_ONLINE, CPUHP_AP_PERF_ARM_CCI_ONLINE, @@ -252,8 +240,6 @@ enum cpuhp_state { CPUHP_AP_BASE_CACHEINFO_ONLINE, CPUHP_AP_ONLINE_DYN, CPUHP_AP_ONLINE_DYN_END = CPUHP_AP_ONLINE_DYN + 30, - /* Must be after CPUHP_AP_ONLINE_DYN for node_states[N_CPU] update */ - CPUHP_AP_MM_DEMOTION_ONLINE, CPUHP_AP_X86_HPET_ONLINE, CPUHP_AP_X86_KVM_CLK_ONLINE, CPUHP_AP_ACTIVE,