Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp444569img; Fri, 22 Mar 2019 01:11:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqzpZJmtd68JMulAO025fwjIBo5mNJuL+pFcA0W0u12IJrgkT6jRT5sjTqzx741jXb5JeYFH X-Received: by 2002:a65:538b:: with SMTP id x11mr7484930pgq.35.1553242291289; Fri, 22 Mar 2019 01:11:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553242291; cv=none; d=google.com; s=arc-20160816; b=rRqCq26CQhEyO3FnPRQZO2nv+u12xV5X373sEtSzR+FzCUK7nVmny2i34CgSsGm1i7 vwidjGyjFtyEvpHbUH1sIm/LFD8IukIDeXal8G35zqpj4gUJBFpOhMXkGmD0hNcGTC76 DtuoNeWNgPiZHeHzIB6ZHJSrhAdwCSupUIcG40fTSnmfmDrQsTXJXoQTgr8zLrTP+hts Fno3lXlcFni8aQ/ie9o9m35yXJbdc0rEEL0srauH5lzPpXJlB07AgnzWuBORIiXWR2Kd VLIRGF1steXUUxCGZ0odi6ZFkxC+0Iew6/g55zgFXM1HmI/f95VVNlEUAroLeM0N39Bw uYvw== 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:dkim-signature; bh=Anea+wdxQdUzFRJ0v2ituFKgsuQQegKA7uxwWZQNN1I=; b=L2XT8WgT+xylJxL3pCRTKNtVJbQZA6T3bjhS0F8pxT7rP7WIcuFcvI2jUHsnLtIudR BsM/ZMyN7KwrjNBAFjF8iCIk76k7bvl71y0C88F+xa3WwW8VSPJKv9t5PSE9tpzb6qzG e1fcyFS1sAoR+rSr5dAusozeZ7O1DwYuDvoO2nY0NAWPy+vmT6g3tLBujKWfHdGGW07Y mHhEYFJ5r9fu+1Lm9ZOXrmEWZpKIB53+1dxw4LOTjZT2zJ+HR3Ucmr2vW0jHRL/ls+oq XYN6q5o/efGBjQLQ7cSgFKAa7wPuxU+gNqFDYBECttePWXhI0WDeUuPMAWLzTe1qPrrQ m7aA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=A9kK2FYh; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u19si6196152pga.567.2019.03.22.01.11.16; Fri, 22 Mar 2019 01:11:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=A9kK2FYh; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727667AbfCVIIo (ORCPT + 99 others); Fri, 22 Mar 2019 04:08:44 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:12244 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726066AbfCVIIn (ORCPT ); Fri, 22 Mar 2019 04:08:43 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 44Qbrn1LmGz9v9vN; Fri, 22 Mar 2019 09:08:41 +0100 (CET) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=A9kK2FYh; dkim-adsp=pass; dkim-atps=neutral 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 BryasBt4GGeO; Fri, 22 Mar 2019 09:08:41 +0100 (CET) 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 44Qbrn0BJBz9v9vG; Fri, 22 Mar 2019 09:08:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1553242121; bh=Anea+wdxQdUzFRJ0v2ituFKgsuQQegKA7uxwWZQNN1I=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=A9kK2FYhJd35yot2LJ2fSi01S07f9MPNbHtxf1yjHszqCKRoiAdlomVbTmny7NnSP 7bSwfeeGVNrZgacp1ul3McJjgq4H25wHRdsM49PSnD3sIDbdfY6fQz8BhC1USp7IUG LML381YH6VozkArwC3/cnDz3UEJkic5VvnLs/4i4= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id F391E8B845; Fri, 22 Mar 2019 09:08:41 +0100 (CET) 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 RfiatwrynwnG; Fri, 22 Mar 2019 09:08:41 +0100 (CET) Received: from po16846vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.231.2]) by messagerie.si.c-s.fr (Postfix) with ESMTP id DD30D8B844; Fri, 22 Mar 2019 09:08:41 +0100 (CET) Received: by po16846vm.idsi0.si.c-s.fr (Postfix, from userid 0) id D23396CD85; Fri, 22 Mar 2019 08:08:41 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH 3/7] powerpc/setup: define cpu_pvr at all time To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Fri, 22 Mar 2019 08:08:41 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To avoid ifdefs, define cpu_pvr at all time. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/setup-common.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index a90e8367ccde..a4ed9301e815 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -190,9 +190,7 @@ void machine_halt(void) machine_hang(); } -#ifdef CONFIG_SMP DEFINE_PER_CPU(unsigned int, cpu_pvr); -#endif static void show_cpuinfo_summary(struct seq_file *m) { @@ -234,11 +232,11 @@ static int show_cpuinfo(struct seq_file *m, void *v) unsigned short maj; unsigned short min; -#ifdef CONFIG_SMP - pvr = per_cpu(cpu_pvr, cpu_id); -#else - pvr = mfspr(SPRN_PVR); -#endif + if (IS_ENABLED(CONFIG_SMP)) + pvr = per_cpu(cpu_pvr, cpu_id); + else + pvr = mfspr(SPRN_PVR); + maj = (pvr >> 8) & 0xFF; min = pvr & 0xFF; -- 2.13.3