Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp443445img; Fri, 22 Mar 2019 01:09:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqyjsFU0JBt18nNIg9o0YPqWREJDfk6rpyJXBIj2X0Fa656GIynmAi/u+HGrhuy4xeTdU9yn X-Received: by 2002:aa7:8589:: with SMTP id w9mr7813526pfn.97.1553242190779; Fri, 22 Mar 2019 01:09:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553242190; cv=none; d=google.com; s=arc-20160816; b=Eb6oCxBwv3lQbc61GyFk4WwhKdjsR3gm3EUnIezmicDPLnBcN4eGGc2HZ8nuyTzGSq txLEdYt7bXF4JBcrbCUFSl/MXjL+EqRgjQYXrTqjS4OmbKfGPScZzdKa1kZhP41S/Iv8 O8oRj6Z2hF0Jr9HHKkGQDJDeC3PBjQnE83WP1Yr61b/WhnWtrVJ3qSNG0bu58Vo3+Nou Sl5JwsLAgUSla3xyabxXTCd+ml9x+d0wAsfLS1O2G3u0CXhYA88bgcd0QIdGxhbqSqwH wryK023d/bjX+7X2V0fbhPO7lzD1dyRWb+/OpK0T9Vny8K010hSHBmFxRUw/GVxTzW1T /lVA== 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=qbdxgb1HYWPobWcLuIAD+ZD4jJ/zVC4av8h4SDf/6DM=; b=ffB2459/NlBSskphaUfuQxYlydo8QH1vjV5SjuM83Y3h250SUhELgcv848DGZIMtwo oYZHKgrfkUuTGBtRFwCGPXPTYwg4zLIEe4m4FCZmD0mqeT29ycwMitL8cI3nVQ2bbN3z a7Vcblxqogem7ZXQF2Ao1RuNT6NX5WlTxko5tSt9qBknuRwCmslplnD64muu1ozcWAl2 8F27qtDHw6PNzNRk3x6I8RhMDh8DDHpmhJLK7QlnbhBlpY5xWiul0z1Ed6PBzJO/EMh5 8KPcTk85b15jkIbAvTk6aBsMBEZwo5NxQhTocqXB250Qmha+htmC++AeFJ+pt5mWS6M0 0HXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b="whjER/+6"; 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 x7si6319931plr.73.2019.03.22.01.09.35; Fri, 22 Mar 2019 01:09:50 -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="whjER/+6"; 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 S1727703AbfCVIIs (ORCPT + 99 others); Fri, 22 Mar 2019 04:08:48 -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 S1727681AbfCVIIp (ORCPT ); Fri, 22 Mar 2019 04:08:45 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 44Qbrq2NVtz9v9vV; Fri, 22 Mar 2019 09:08:43 +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=whjER/+6; 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 eaWPTpchCSG5; Fri, 22 Mar 2019 09:08:43 +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 44Qbrq1CwNz9v9vG; Fri, 22 Mar 2019 09:08:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1553242123; bh=qbdxgb1HYWPobWcLuIAD+ZD4jJ/zVC4av8h4SDf/6DM=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=whjER/+637OTJ22ms0B1Wx5Q9DLdpSLa2G5GoDFUFRVo3sSJil5yf699PTwJIE4CX BkUMLiE6Sj2sMoBq4KiE2ToV/A38oBwGXw4x8w5XEqYJS7uzvXcJZg9Crv6Vjiemb6 hi2ufc8tFtHMtNqbhUXNGhQSb3mfkjKVpXGFfZZE= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 1C7658B845; Fri, 22 Mar 2019 09:08:44 +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 fA2g55RPylpa; Fri, 22 Mar 2019 09:08:44 +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 F16188B844; Fri, 22 Mar 2019 09:08:43 +0100 (CET) Received: by po16846vm.idsi0.si.c-s.fr (Postfix, from userid 0) id DD35D6CD85; Fri, 22 Mar 2019 08:08:43 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH 5/7] powerpc/setup: cleanup ifdef mess in check_cache_coherency() 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:43 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use IS_ENABLED() instead of #ifdefs Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/setup-common.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index fa90585760c0..95d545e94c28 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -734,23 +734,19 @@ void __init setup_panic(void) * BUG() in that case. */ -#ifdef CONFIG_NOT_COHERENT_CACHE -#define KERNEL_COHERENCY 0 -#else -#define KERNEL_COHERENCY 1 -#endif +#define KERNEL_COHERENCY (!IS_ENABLED(CONFIG_NOT_COHERENT_CACHE)) static int __init check_cache_coherency(void) { struct device_node *np; const void *prop; - int devtree_coherency; + bool devtree_coherency; np = of_find_node_by_path("/"); prop = of_get_property(np, "coherency-off", NULL); of_node_put(np); - devtree_coherency = prop ? 0 : 1; + devtree_coherency = prop ? false : true; if (devtree_coherency != KERNEL_COHERENCY) { printk(KERN_ERR -- 2.13.3