From: "Luis R. Rodriguez" <mcg...@suse.com> The enabler / disabler is pretty simple, just use the provided wrappers, this lets us easily relate the variable to the associated Kconfig entry.
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org> Cc: Tony Lindgren <t...@atomide.com> Cc: linux-kernel@vger.kernel.org Cc: Thomas Gleixner <t...@linutronix.de> Cc: Ingo Molnar <mi...@redhat.com> Cc: "H. Peter Anvin" <h...@zytor.com> Cc: x...@kernel.org Cc: Juergen Gross <jgr...@suse.com> Cc: Andy Lutomirski <l...@amacapital.net> Cc: Toshi Kani <toshi.k...@hp.com> Cc: Dave Hansen <dave.han...@linux.intel.com> Cc: Jan Beulich <jbeul...@suse.com> Cc: Pavel Machek <pa...@ucw.cz> Cc: Xishi Qiu <qiuxi...@huawei.com> Cc: Andrew Morton <a...@linux-foundation.org> Cc: David Vrabel <david.vra...@citrix.com> Cc: Borislav Petkov <b...@suse.de> Cc: Vlastimil Babka <vba...@suse.cz> Cc: Joonsoo Kim <iamjoonsoo....@lge.com> Cc: Dexuan Cui <de...@microsoft.com> Signed-off-by: Luis R. Rodriguez <mcg...@suse.com> --- 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 8d375ba..ce5db80 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 -- 2.2.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/