From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D92DDC433DF for ; Wed, 19 Aug 2020 02:00:27 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8830E2067C for ; Wed, 19 Aug 2020 02:00:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ellerman.id.au header.i=@ellerman.id.au header.b="ge3eqSkk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8830E2067C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4BWWFh54GZzDqpG for ; Wed, 19 Aug 2020 12:00:24 +1000 (AEST) Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4BWW9L6pWqzDqnK for ; Wed, 19 Aug 2020 11:56:38 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ellerman.id.au header.i=@ellerman.id.au header.a=rsa-sha256 header.s=201909 header.b=ge3eqSkk; dkim-atps=neutral Received: by ozlabs.org (Postfix) id 4BWW9L6B8Sz9sTY; Wed, 19 Aug 2020 11:56:38 +1000 (AEST) Received: by ozlabs.org (Postfix, from userid 1034) id 4BWW9L5CqSz9sTb; Wed, 19 Aug 2020 11:56:38 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ellerman.id.au; s=201909; t=1597802198; bh=l6AFhSuZ28HjKGhc4vYbzbK6GGmi/2uRw/gPbOMqX4s=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ge3eqSkkLTpyM4gm91A1RDKKwamIpJTWcxA1pRjv/y68E01kwUT7PzOfMHFuSy7IX NEYgGUMD3EcIWwm4Q8HkvfduI0ms4TxPkDzGfFmBT2A2r3zxH8yEH1f0rS6pX5Vd/t QTw4L616VtmYc9cdbK9WB3Ovh8t/sugmKSUofb5JpRHPjxME1mkXDiSiMaHWouvV6Z TUGrdNAGiswR0YVF7AAQ74QWRL0B5W3ozuSIZscuwz40zsL0EXTCF1+e/MiLldy27q QAR4p8bIQHthm4ihQsHa5rOPUmSiz5I7MIeVgRUiO31o9P66LLgzidUqavH9wpQ0ir chGexVmMhmEGg== From: Michael Ellerman To: linuxppc-dev@ozlabs.org Subject: [PATCH 2/3] powerpc/smp: Fold cpu_die() into its only caller Date: Wed, 19 Aug 2020 11:56:33 +1000 Message-Id: <20200819015634.1974478-2-mpe@ellerman.id.au> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200819015634.1974478-1-mpe@ellerman.id.au> References: <20200819015634.1974478-1-mpe@ellerman.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Avoid the eternal confusion between cpu_die() and __cpu_die() by removing the former, folding it into its only caller. Signed-off-by: Michael Ellerman --- arch/powerpc/include/asm/smp.h | 1 - arch/powerpc/kernel/smp.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h index 49a25e2400f2..a314d2d2d2be 100644 --- a/arch/powerpc/include/asm/smp.h +++ b/arch/powerpc/include/asm/smp.h @@ -29,7 +29,6 @@ extern int boot_cpuid; extern int spinning_secondaries; extern u32 *cpu_to_phys_id; -extern void cpu_die(void); extern int cpu_to_chip_id(int cpu); #ifdef CONFIG_SMP diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index b05d2db13d08..c616d975bf95 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c @@ -1432,11 +1432,7 @@ void __cpu_die(unsigned int cpu) void arch_cpu_idle_dead(void) { sched_preempt_enable_no_resched(); - cpu_die(); -} -void cpu_die(void) -{ /* * Disable on the down path. This will be re-enabled by * start_secondary() via start_secondary_resume() below -- 2.25.1