Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp115180pxu; Tue, 6 Oct 2020 02:07:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKpgx2F+ZHT4FoVpR7F06VjErHpLSEAz7fsS8N2raZ/WFD3S9St7XUq9ktAIVpY77ehtaw X-Received: by 2002:a50:d5d8:: with SMTP id g24mr4160940edj.119.1601975257254; Tue, 06 Oct 2020 02:07:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601975257; cv=none; d=google.com; s=arc-20160816; b=gbIg6eHI8w96AueRDr8+QVAHbdqxKz5V3+w2Zq+2cfJZWaeFCQanxotp9YH8+5Qjhm QcLvJJMwgtIXZ80qcO7IWiI3IOxKkpfSL6Brg3ZZ7LxnQ2lTyNFpiZktJqsTcqOJkeAI 2WPZqcWKunhewV1FhjCBgtFvcpCYgo+545LpM/S6VdOff42mqwt6B4jpdREkjxOdY9+w RWuVhRF8XBxHhjDHqrAI8Alz6bDXuswFYIJjC0i+YucesFUQuLyNDxWZxTNhtMXHnxAl zCunOFU623kEAeE85ZZRlou2MZK0iHMy4y56mLeKpkdYm36/BZ92uFSwaFw75J2ZUS4z n69w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:cc:to:subject:from:references:in-reply-to :message-id; bh=Z2LLL1H36OFcf2S+PrT3j7Y4R2/D7XbLPbz3T0kR35s=; b=cFw9kqMmUF9/nPSr7CnrKZF0ou0KeaU65XD+fXHjOMfGP9oNfY1mCgzcrY0athJU69 X2P7vBUiXVcuKRz8uEvITiz6QbfJnrx2gEo7qLaDNcZYQvFLYpFUPLOQmXu2ruMiJlTf C2VfCJ8mR1L/+LQEHZJQa05fqAVl1Z2whJBcf4aueLktD7YgUl+bHjyYXiwsV3LN4SCX D//MS/RvdHmDyYCZGzEiaORk7dJdXSa87vIDGhTS7CNz8AaOecJ8q93Aio9BHDrgEszl t03kITZDmBlvhMtNYRwJGfDsuj8JT4dAP366vXcez9smernlxYlfLJBH7i+l7VSx8SlE L/xw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k26si2198142eds.483.2020.10.06.02.07.14; Tue, 06 Oct 2020 02:07:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726018AbgJFJFl (ORCPT + 99 others); Tue, 6 Oct 2020 05:05:41 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:7455 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725891AbgJFJFk (ORCPT ); Tue, 6 Oct 2020 05:05:40 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4C5BQ92skmz9tyfQ; Tue, 6 Oct 2020 11:05:37 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id I0kuODAj476l; Tue, 6 Oct 2020 11:05:37 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4C5BQ90w0dz9tyf5; Tue, 6 Oct 2020 11:05:37 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 1596E8B7C3; Tue, 6 Oct 2020 11:05:38 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id 4ioz5Kq1wCci; Tue, 6 Oct 2020 11:05:38 +0200 (CEST) Received: from po17688vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id CD6578B7C5; Tue, 6 Oct 2020 11:05:37 +0200 (CEST) Received: by po17688vm.idsi0.si.c-s.fr (Postfix, from userid 0) id A80FD65DE8; Tue, 6 Oct 2020 09:05:37 +0000 (UTC) Message-Id: <1b68632425d8866d147aea9005004e4594672211.1601975100.git.christophe.leroy@csgroup.eu> In-Reply-To: <319d379f696412681c66a987cc75e6abf8f958d2.1601975100.git.christophe.leroy@csgroup.eu> References: <319d379f696412681c66a987cc75e6abf8f958d2.1601975100.git.christophe.leroy@csgroup.eu> From: Christophe Leroy Subject: [PATCH 2/2] powerpc/32s: Remove #ifdef CONFIG_PPC_BOOK3S_32 in head_book3s_32.S To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Tue, 6 Oct 2020 09:05:37 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org head_book3s_32.S is only built when CONFIG_PPC_BOOK3S_32 is selected. Remove all conditions based on CONFIG_PPC_BOOK3S_32 in the file. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/head_book3s_32.S | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/arch/powerpc/kernel/head_book3s_32.S b/arch/powerpc/kernel/head_book3s_32.S index e07a2c07ffe4..f659378adaf3 100644 --- a/arch/powerpc/kernel/head_book3s_32.S +++ b/arch/powerpc/kernel/head_book3s_32.S @@ -183,10 +183,8 @@ __after_mmu_off: bl reloc_offset li r24,0 /* cpu# */ bl call_setup_cpu /* Call setup_cpu for this CPU */ -#ifdef CONFIG_PPC_BOOK3S_32 bl reloc_offset bl init_idle_6xx -#endif /* CONFIG_PPC_BOOK3S_32 */ /* @@ -892,10 +890,8 @@ __secondary_start: lis r3,-KERNELBASE@h mr r4,r24 bl call_setup_cpu /* Call setup_cpu for this CPU */ -#ifdef CONFIG_PPC_BOOK3S_32 lis r3,-KERNELBASE@h bl init_idle_6xx -#endif /* CONFIG_PPC_BOOK3S_32 */ /* get current's stack and current */ lis r2,secondary_current@ha @@ -936,17 +932,6 @@ __secondary_start: #include "../kvm/book3s_rmhandlers.S" #endif -/* - * Those generic dummy functions are kept for CPUs not - * included in CONFIG_PPC_BOOK3S_32 - */ -#if !defined(CONFIG_PPC_BOOK3S_32) -_ENTRY(__save_cpu_setup) - blr -_ENTRY(__restore_cpu_setup) - blr -#endif /* !defined(CONFIG_PPC_BOOK3S_32) */ - /* * Load stuff into the MMU. Intended to be called with * IR=0 and DR=0. -- 2.25.0