Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp2070292pxa; Sun, 16 Aug 2020 22:48:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/me+2cjraIYpZQalZclneEDYAv00MUrSMASgjl01j85XmoFM6tURPTzP+9KsJKZ4N7FCy X-Received: by 2002:aa7:c34d:: with SMTP id j13mr13313734edr.209.1597643331314; Sun, 16 Aug 2020 22:48:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597643331; cv=none; d=google.com; s=arc-20160816; b=s/6JLtJExtygfIe4hdlpO8Rb3I/pLhVpZ+hCzXPNzMYRhspVNMzMJXnCKn3R1aZqkY XrW/zCabM44k2gZ582cGWWEQTUu+KQBPMQwLGQ2fr5YaaUzXbQ+2B66U+rfnKipf2W4t oBkCQPF9DB9vicq1H1AliN+oMhg3xRVyiDHQz227vmCM4wBgnuV07/POG81IBAE8iZx3 dyW9yN731xnczKqNxODJHbOaijgDYGla+JmGewKlXzqpJkx3a9zPF06t9IheKZ6cgoPJ khaPIMpJ2dpSiWF+/DVErxdFkQditfBDSsE6U4+27ggiXyMzudQOCRTI8BGWts6sTe1k +t5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:message-id; bh=loRC/cyoTdF+bvyZwERH1CkzJQ2lybtfWxKvi3vlpg0=; b=vphSXzIBE/g7R5yTDOv2MV0cTpuebCEplkr5ftZPhlSQcwZfKH2vl5/VHXPUMZEEH2 aZcX48/aNnmC+bBjWlfzzPU5poAM+M2vkI0VTkMf2ya8AYXHtnbChw21QZuM7+ea0wZU L123Pdxtz7ATJKFnmXjLVKvA/RAlL2QS/Tt0OryE5ZxND6/OG/SZWgo+qKlkxpkoOcfS PUZ8X/NcGoaAJ3SPztrrjT1ebw0avHctLx4fk8gV0icrD82dpcZoVk+9Fk/tN4Hi237A FXQRf2Jgfv/Y+HC/y7SH3B6U9r643Mhf4Ih2efbPR6TNR/tsOps7eN1I8oXgkMm/VXgk GhwQ== 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 gz9si10568254ejb.81.2020.08.16.22.48.28; Sun, 16 Aug 2020 22:48:51 -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 S1726738AbgHQFqp (ORCPT + 99 others); Mon, 17 Aug 2020 01:46:45 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:5083 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726308AbgHQFqn (ORCPT ); Mon, 17 Aug 2020 01:46:43 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4BVNMd3JSNz9tydq; Mon, 17 Aug 2020 07:46: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 32C2lktAlH-d; Mon, 17 Aug 2020 07:46: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 4BVNMd2Rh6z9tydp; Mon, 17 Aug 2020 07:46:37 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 39D3E8B772; Mon, 17 Aug 2020 07:46:42 +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 Ah8qHDAVsB4D; Mon, 17 Aug 2020 07:46:42 +0200 (CEST) Received: from po17688vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.230.104]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 1E47F8B75B; Mon, 17 Aug 2020 07:46:42 +0200 (CEST) Received: by po17688vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 1BDDB65CDD; Mon, 17 Aug 2020 05:46:42 +0000 (UTC) Message-Id: From: Christophe Leroy Subject: [PATCH v1] powerpc/process: Replace an #ifdef CONFIG_PPC_BOOK3S_64 by IS_ENABLED() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Mon, 17 Aug 2020 05:46:42 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This #ifdef CONFIG_PPC_BOOK3S_64 calls preload_new_slb_context() when radix is not enabled. radix_enabled() is always defined, and the prototype for preload_new_slb_context() is always present, so the #ifdef is unneeded. Replace it by IS_ENABLED(). Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/process.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index 987bc8e73d5e..a17d0746d55f 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@ -1725,10 +1725,8 @@ void start_thread(struct pt_regs *regs, unsigned long start, unsigned long sp) #ifdef CONFIG_PPC64 unsigned long load_addr = regs->gpr[2]; /* saved by ELF_PLAT_INIT */ -#ifdef CONFIG_PPC_BOOK3S_64 - if (!radix_enabled()) + if (IS_ENABLED(CONFIG_PPC_BOOK3S_64) && !radix_enabled()) preload_new_slb_context(start, sp); -#endif #endif /* -- 2.25.0