[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-73c8c861dc5bddf1b24c6aeffee2292c96cf8db2@git.kernel.org>
Date: Thu, 5 Mar 2015 03:50:31 -0800
From: "tip-bot for Luis R. Rodriguez" <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: tony@...mide.com, JBeulich@...e.com, gregkh@...uxfoundation.org,
decui@...rosoft.com, toshi.kani@...com, david.vrabel@...rix.com,
pavel@....cz, bp@...e.de, luto@...capital.net,
iamjoonsoo.kim@....com, linux-kernel@...r.kernel.org,
mingo@...nel.org, qiuxishi@...wei.com, bp@...en8.de,
vbabka@...e.cz, akpm@...ux-foundation.org, hpa@...or.com,
jgross@...e.com, dave.hansen@...ux.intel.com, mcgrof@...e.com,
torvalds@...ux-foundation.org, tglx@...utronix.de
Subject: [tip:x86/mm] x86/mm: Use early_param_on_off() for direct_gbpages
Commit-ID: 73c8c861dc5bddf1b24c6aeffee2292c96cf8db2
Gitweb: http://git.kernel.org/tip/73c8c861dc5bddf1b24c6aeffee2292c96cf8db2
Author: Luis R. Rodriguez <mcgrof@...e.com>
AuthorDate: Wed, 4 Mar 2015 17:24:14 -0800
Committer: Ingo Molnar <mingo@...nel.org>
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 <mcgrof@...e.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: Andy Lutomirski <luto@...capital.net>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Borislav Petkov <bp@...e.de>
Cc: Dave Hansen <dave.hansen@...ux.intel.com>
Cc: David Vrabel <david.vrabel@...rix.com>
Cc: Dexuan Cui <decui@...rosoft.com>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: JBeulich@...e.com
Cc: Jan Beulich <JBeulich@...e.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@....com>
Cc: Juergen Gross <jgross@...e.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Pavel Machek <pavel@....cz>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Tony Lindgren <tony@...mide.com>
Cc: Toshi Kani <toshi.kani@...com>
Cc: Vlastimil Babka <vbabka@...e.cz>
Cc: Xishi Qiu <qiuxishi@...wei.com>
Cc: julia.lawall@...6.fr
Link: http://lkml.kernel.org/r/1425518654-3403-5-git-send-email-mcgrof@do-not-panic.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists