Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp2071207pxa; Sun, 16 Aug 2020 22:51:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxnAgXAVT4vug3+5NN0ElGI6tRq1QPJgOUxXYt4aREq8anQhT5rDahnVT0z/MeiPjCQrNtb X-Received: by 2002:a05:6402:3113:: with SMTP id dc19mr12791144edb.280.1597643498328; Sun, 16 Aug 2020 22:51:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597643498; cv=none; d=google.com; s=arc-20160816; b=EcQsIOUSTnePy9YT7TZh2htrFMVdbNTiAjkRQ6DezNnIe1GWTVMXHyNtFjSGVIaNmt zhjwNu1FwP3Ol3j8Ba89IwqilW8ZW76EOtVW0Adl0Y/3mJgOQxhtfzamYUMjHDq0Wc/3 zNfqvBvCpYG+AL0opbp4hxQ3piQVKpQcO/IKSIhg5JHO8AGZW52LhTYg8rbHlkowyVea 0x/1gLgmRmVXDGjuig+C0t9+FZ7nXFRGfTuiMApzx0N7ELwf5/kiHMI2WTP4MYCoJNAZ Shhx0Z2m3W9rMpce3CPJszjZLzFTgGXHtGEXRvRN57nbETYmw0j3YlGzpkBZnSkmBfZg l43A== 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:references :in-reply-to:message-id; bh=qjclFeKJaxqKhMvmq88JN1WQElN3QNpNn8Aqj6Lmoes=; b=rF7xh3wh+ktY412e6rH0o4YdyvEzk+PhPSatGWzFxDF4szCMQOGHCqY6s6tMrhKCrF Jw5JrKP62vvMnco93uVnGvMvbuBSSQUQFchdNvgtKO5Cs4OccI9vNCNnJHmpVEnohcqk bFDWAI/Uop3goIhqfmhK2Uq04tz5fbLhS8BXvLEMOLzer/MBydW0Lc5BDgEp8hFN34JV a9E8uKKS1EtfZU1lL1YWStRjDNuxaZ661AgsDgYsgUAEK5HF1Ov8eeJ03X8P4mQLBMYH ak6pL35Zro1OSin2sGAPv1HmhMn40Oyb/7YVHcK10OLrWQIiXu8mLh5/bZ8lLb3UV/b2 JbxA== 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 j19si10362848edr.368.2020.08.16.22.51.15; Sun, 16 Aug 2020 22:51:38 -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 S1726838AbgHQFsD (ORCPT + 99 others); Mon, 17 Aug 2020 01:48:03 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:60189 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726651AbgHQFsA (ORCPT ); Mon, 17 Aug 2020 01:48:00 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4BVNP56qgxz9tytq; Mon, 17 Aug 2020 07:47:53 +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 Jvk4mRrGdO44; Mon, 17 Aug 2020 07:47:53 +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 4BVNP55g2kz9tytl; Mon, 17 Aug 2020 07:47:53 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 9BD0D8B772; Mon, 17 Aug 2020 07:47:58 +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 KHvHLB61Gfem; Mon, 17 Aug 2020 07:47:58 +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 7A0768B75B; Mon, 17 Aug 2020 07:47:58 +0200 (CEST) Received: by po17688vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 6ED7365CDD; Mon, 17 Aug 2020 05:47:58 +0000 (UTC) Message-Id: <69c8b7954ceeccc6b849e52e1fa41b3a0f10f6c1.1597643221.git.christophe.leroy@csgroup.eu> In-Reply-To: <0eb61cf0dc66d781d47deb2228498cd61d03a754.1597643221.git.christophe.leroy@csgroup.eu> References: <0eb61cf0dc66d781d47deb2228498cd61d03a754.1597643221.git.christophe.leroy@csgroup.eu> From: Christophe Leroy Subject: [PATCH v1 4/4] powerpc/process: Remove useless #ifdef CONFIG_PPC_FPU To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Mon, 17 Aug 2020 05:47:58 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a stub for __giveup_fpu() when CONFIG_PPC_FPU is not selected, as done for CONFIG_SPE and CONFIG_ALTIVEC. This allows to remove some #ifdef CONFIG_PPC_FPU. Also change one to IS_ENABLED(). Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/process.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index 7090c99a60d9..8133a6ce3242 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@ -229,6 +229,8 @@ void enable_kernel_fp(void) } } EXPORT_SYMBOL(enable_kernel_fp); +#else +static inline void __giveup_fpu(struct task_struct *tsk) { } #endif /* CONFIG_PPC_FPU */ #ifdef CONFIG_ALTIVEC @@ -406,9 +408,8 @@ static unsigned long msr_all_available; static int __init init_msr_all_available(void) { -#ifdef CONFIG_PPC_FPU - msr_all_available |= MSR_FP; -#endif + if (IS_ENABLED(CONFIG_PPC_FPU)) + msr_all_available |= MSR_FP; if (cpu_has_feature(CPU_FTR_ALTIVEC)) msr_all_available |= MSR_VEC; if (cpu_has_feature(CPU_FTR_VSX)) @@ -438,10 +439,8 @@ void giveup_all(struct task_struct *tsk) WARN_ON((usermsr & MSR_VSX) && !((usermsr & MSR_FP) && (usermsr & MSR_VEC))); -#ifdef CONFIG_PPC_FPU if (usermsr & MSR_FP) __giveup_fpu(tsk); -#endif if (usermsr & MSR_VEC) __giveup_altivec(tsk); if (usermsr & MSR_SPE) -- 2.25.0