From patchwork Tue Aug 23 16:45:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 74508 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp2196198qga; Tue, 23 Aug 2016 09:49:27 -0700 (PDT) X-Received: by 10.98.34.151 with SMTP id p23mr55293776pfj.102.1471970967597; Tue, 23 Aug 2016 09:49:27 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x126si4636719pfb.249.2016.08.23.09.49.25; Tue, 23 Aug 2016 09:49:27 -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=@nifty.com; 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 S1753937AbcHWQtX (ORCPT + 27 others); Tue, 23 Aug 2016 12:49:23 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:54461 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752306AbcHWQtV (ORCPT ); Tue, 23 Aug 2016 12:49:21 -0400 Received: from grover.sesame (FL1-119-242-215-193.osk.mesh.ad.jp [119.242.215.193]) (authenticated) by conuserg-11.nifty.com with ESMTP id u7NGkE2a008493; Wed, 24 Aug 2016 01:46:19 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com u7NGkE2a008493 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1471970780; bh=jl8/AUtUIIWRtOa8EmSPekO0ncPv2wHPlEJ2QLUEWKg=; h=From:To:Cc:Subject:Date:From; b=cakViLuuPVl2HXgO/2axkGk3L2/fA+WL4ai59IvOlvyNQ4dMkQuuIJCtIRRHK2puC g3SiPZ7pV64RSc9dYG9HDbj9qb/xxmJv/7pDaQrY9yl2BX7AJXmUp7si646WQ+kP21 RD8M/qio3mfcv2Xl+pfVUtR2fweRabSy1si+1OSRJVE+CG7KyTOFtN8Lm4SxQKlHc1 ZrXbPhH6cpGUNwlW+L+JvaPQKKb0EP1zvS+HNopVDpRVM2QmsttnaDXdtM/DwsP0aL pyalSLKqaeImkkyp97xIo4e4a+iMWd2vSqKPzcVw+XeYb7sP2vGWa8WdurC7nk2p6O AkDA6+QXwemtQ== X-Nifty-SrcIP: [119.242.215.193] From: Masahiro Yamada To: Andrew Morton , linux-kernel@vger.kernel.org Cc: Masahiro Yamada , Peter Oberparleiter , linux-s390@vger.kernel.org, Michael Holzheu , Kees Cook , Christian Borntraeger , Heiko Carstens , x86@kernel.org, "H. Peter Anvin" , Thomas Gleixner , Dan Williams , Toshi Kani , linux-mips@linux-mips.org, Paul Burton , Ingo Molnar , Ralf Baechle , Thomas Garnier , David Hildenbrand , Martin Schwidefsky Subject: [PATCH] treewide: replace config_enabled() with IS_ENABLED() (2nd round) Date: Wed, 24 Aug 2016 01:45:49 +0900 Message-Id: <1471970749-24867-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 97f2645f358b ("tree-wide: replace config_enabled() with IS_ENABLED()") mostly killed config_enabled(), but some new users have appeared for v4.8-rc1. They are all used for a boolean option, so can be replaced with IS_ENABLED() safely. Signed-off-by: Masahiro Yamada --- arch/mips/include/asm/page.h | 4 ++-- arch/s390/kernel/setup.c | 6 ++---- arch/x86/mm/kaslr.c | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) -- 1.9.1 diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h index ea0cd97..5f98759 100644 --- a/arch/mips/include/asm/page.h +++ b/arch/mips/include/asm/page.h @@ -164,7 +164,7 @@ typedef struct { unsigned long pgprot; } pgprot_t; */ static inline unsigned long ___pa(unsigned long x) { - if (config_enabled(CONFIG_64BIT)) { + if (IS_ENABLED(CONFIG_64BIT)) { /* * For MIPS64 the virtual address may either be in one of * the compatibility segements ckseg0 or ckseg1, or it may @@ -173,7 +173,7 @@ static inline unsigned long ___pa(unsigned long x) return x < CKSEG0 ? XPHYSADDR(x) : CPHYSADDR(x); } - if (!config_enabled(CONFIG_EVA)) { + if (!IS_ENABLED(CONFIG_EVA)) { /* * We're using the standard MIPS32 legacy memory map, ie. * the address x is going to be in kseg0 or kseg1. We can diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index ba5f456..7f7ba5f2 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -204,11 +204,9 @@ static void __init conmode_default(void) #endif } } else if (MACHINE_IS_KVM) { - if (sclp.has_vt220 && - config_enabled(CONFIG_SCLP_VT220_CONSOLE)) + if (sclp.has_vt220 && IS_ENABLED(CONFIG_SCLP_VT220_CONSOLE)) SET_CONSOLE_VT220; - else if (sclp.has_linemode && - config_enabled(CONFIG_SCLP_CONSOLE)) + else if (sclp.has_linemode && IS_ENABLED(CONFIG_SCLP_CONSOLE)) SET_CONSOLE_SCLP; else SET_CONSOLE_HVC; diff --git a/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c index ec8654f..bda8d5e 100644 --- a/arch/x86/mm/kaslr.c +++ b/arch/x86/mm/kaslr.c @@ -77,7 +77,7 @@ static inline unsigned long get_padding(struct kaslr_memory_region *region) */ static inline bool kaslr_memory_enabled(void) { - return kaslr_enabled() && !config_enabled(CONFIG_KASAN); + return kaslr_enabled() && !IS_ENABLED(CONFIG_KASAN); } /* Initialize base and padding for each memory region randomized with KASLR */