From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932774AbbCELv1 (ORCPT ); Thu, 5 Mar 2015 06:51:27 -0500 Received: from terminus.zytor.com ([198.137.202.10]:47936 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932756AbbCELvX (ORCPT ); Thu, 5 Mar 2015 06:51:23 -0500 Date: Thu, 5 Mar 2015 03:50:31 -0800 From: "tip-bot for Luis R. Rodriguez" Message-ID: Cc: tony@atomide.com, JBeulich@suse.com, gregkh@linuxfoundation.org, decui@microsoft.com, toshi.kani@hp.com, david.vrabel@citrix.com, pavel@ucw.cz, bp@suse.de, luto@amacapital.net, iamjoonsoo.kim@lge.com, linux-kernel@vger.kernel.org, mingo@kernel.org, qiuxishi@huawei.com, bp@alien8.de, vbabka@suse.cz, akpm@linux-foundation.org, hpa@zytor.com, jgross@suse.com, dave.hansen@linux.intel.com, mcgrof@suse.com, torvalds@linux-foundation.org, tglx@linutronix.de Reply-To: bp@suse.de, luto@amacapital.net, decui@microsoft.com, toshi.kani@hp.com, pavel@ucw.cz, david.vrabel@citrix.com, tony@atomide.com, JBeulich@suse.com, gregkh@linuxfoundation.org, torvalds@linux-foundation.org, tglx@linutronix.de, dave.hansen@linux.intel.com, mcgrof@suse.com, qiuxishi@huawei.com, bp@alien8.de, vbabka@suse.cz, jgross@suse.com, hpa@zytor.com, akpm@linux-foundation.org, iamjoonsoo.kim@lge.com, mingo@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <1425518654-3403-5-git-send-email-mcgrof@do-not-panic.com> References: <1425518654-3403-5-git-send-email-mcgrof@do-not-panic.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/mm: Use early_param_on_off() for direct_gbpages Git-Commit-ID: 73c8c861dc5bddf1b24c6aeffee2292c96cf8db2 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: 73c8c861dc5bddf1b24c6aeffee2292c96cf8db2 Gitweb: http://git.kernel.org/tip/73c8c861dc5bddf1b24c6aeffee2292c96cf8db2 Author: Luis R. Rodriguez AuthorDate: Wed, 4 Mar 2015 17:24:14 -0800 Committer: Ingo Molnar CommitDate: Thu, 5 Mar 2015 08:02:12 +0100 x86/mm: Use early_param_on_off() for direct_gbpages The enabler / disabler is pretty simple, just use the provided wrappers, this lets us easily relate the variable to the associated Kconfig entry. 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-5-git-send-email-mcgrof@do-not-panic.com Signed-off-by: Ingo Molnar --- arch/x86/mm/init.c | 3 ++- arch/x86/mm/init_64.c | 14 -------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index 2ce2c8e..c35ba8b 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -133,7 +133,8 @@ int after_bootmem; static int page_size_mask; -int direct_gbpages = IS_ENABLED(CONFIG_DIRECT_GBPAGES); +early_param_on_off("gbpages", "nogbpages", + direct_gbpages, CONFIG_DIRECT_GBPAGES); static void __init init_gbpages(void) { diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 30eb05a..3fba623 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -130,20 +130,6 @@ int kernel_ident_mapping_init(struct x86_mapping_info *info, pgd_t *pgd_page, return 0; } -static int __init parse_direct_gbpages_off(char *arg) -{ - direct_gbpages = 0; - return 0; -} -early_param("nogbpages", parse_direct_gbpages_off); - -static int __init parse_direct_gbpages_on(char *arg) -{ - direct_gbpages = 1; - return 0; -} -early_param("gbpages", parse_direct_gbpages_on); - /* * NOTE: pagetable_init alloc all the fixmap pagetables contiguous on the * physical space so we can cache the place of the first one and move