From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932693AbbCELuw (ORCPT ); Thu, 5 Mar 2015 06:50:52 -0500 Received: from terminus.zytor.com ([198.137.202.10]:47887 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932646AbbCELus (ORCPT ); Thu, 5 Mar 2015 06:50:48 -0500 Date: Thu, 5 Mar 2015 03:49:39 -0800 From: "tip-bot for Luis R. Rodriguez" Message-ID: Cc: JBeulich@suse.com, hpa@zytor.com, toshi.kani@hp.com, david.vrabel@citrix.com, tony@atomide.com, pavel@ucw.cz, dave.hansen@linux.intel.com, bp@alien8.de, bp@suse.de, vbabka@suse.cz, luto@amacapital.net, gregkh@linuxfoundation.org, iamjoonsoo.kim@lge.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, mcgrof@suse.com, torvalds@linux-foundation.org, jgross@suse.com, decui@microsoft.com, akpm@linux-foundation.org, mingo@kernel.org, qiuxishi@huawei.com Reply-To: qiuxishi@huawei.com, mingo@kernel.org, decui@microsoft.com, torvalds@linux-foundation.org, jgross@suse.com, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, mcgrof@suse.com, gregkh@linuxfoundation.org, iamjoonsoo.kim@lge.com, bp@alien8.de, dave.hansen@linux.intel.com, pavel@ucw.cz, bp@suse.de, vbabka@suse.cz, luto@amacapital.net, JBeulich@suse.com, hpa@zytor.com, toshi.kani@hp.com, david.vrabel@citrix.com, tony@atomide.com In-Reply-To: <1425518654-3403-2-git-send-email-mcgrof@do-not-panic.com> References: <1425518654-3403-2-git-send-email-mcgrof@do-not-panic.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/mm: Use IS_ENABLED() for direct_gbpages Git-Commit-ID: d9fd579c218e22c897f0f1b9e132af9b436cf445 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: d9fd579c218e22c897f0f1b9e132af9b436cf445 Gitweb: http://git.kernel.org/tip/d9fd579c218e22c897f0f1b9e132af9b436cf445 Author: Luis R. Rodriguez AuthorDate: Wed, 4 Mar 2015 17:24:11 -0800 Committer: Ingo Molnar CommitDate: Thu, 5 Mar 2015 08:02:11 +0100 x86/mm: Use IS_ENABLED() for direct_gbpages Replace #ifdef eyesore with IS_ENABLED() use. Signed-off-by: Luis R. Rodriguez Cc: Andrew Morton Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Borislav Petkov Cc: Dave Hansen Cc: David Vrabel Cc: Dexuan Cui Cc: Greg Kroah-Hartman Cc: H. Peter Anvin Cc: JBeulich@suse.com Cc: Jan Beulich Cc: Joonsoo Kim Cc: Juergen Gross Cc: Linus Torvalds Cc: Pavel Machek Cc: Thomas Gleixner Cc: Tony Lindgren Cc: Toshi Kani Cc: Vlastimil Babka Cc: Xishi Qiu Cc: julia.lawall@lip6.fr Link: http://lkml.kernel.org/r/1425518654-3403-2-git-send-email-mcgrof@do-not-panic.com Signed-off-by: Ingo Molnar --- arch/x86/mm/init.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index a110efc..74f2b37 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -131,11 +131,7 @@ void __init early_alloc_pgt_buf(void) int after_bootmem; -int direct_gbpages -#ifdef CONFIG_DIRECT_GBPAGES - = 1 -#endif -; +int direct_gbpages = IS_ENABLED(CONFIG_DIRECT_GBPAGES); static void __init init_gbpages(void) {