* Juergen Gross <[email protected]> wrote:
> On 03/05/2015 08:27 AM, Ingo Molnar wrote:
> >
> >Now that we've simplified the gbpages config space, move the
> >'page_size_mask' initialization into probe_page_size_mask(), right
> >next to the PSE and PGE enablement lines.
> >
> >Cc: Luis R. Rodriguez <[email protected]>
> >Cc: Andrew Morton <[email protected]>
> >Cc: Andy Lutomirski <[email protected]>
> >Cc: Borislav Petkov <[email protected]>
> >Cc: Borislav Petkov <[email protected]>
> >Cc: Dave Hansen <[email protected]>
> >Cc: David Vrabel <[email protected]>
> >Cc: Dexuan Cui <[email protected]>
> >Cc: Greg Kroah-Hartman <[email protected]>
> >Cc: H. Peter Anvin <[email protected]>
> >Cc: [email protected]
> >Cc: Jan Beulich <[email protected]>
> >Cc: Joonsoo Kim <[email protected]>
> >Cc: Juergen Gross <[email protected]>
> >Cc: Linus Torvalds <[email protected]>
> >Cc: Pavel Machek <[email protected]>
> >Cc: Thomas Gleixner <[email protected]>
> >Cc: Tony Lindgren <[email protected]>
> >Cc: Toshi Kani <[email protected]>
> >Cc: Vlastimil Babka <[email protected]>
> >Cc: Xishi Qiu <[email protected]>
> >Cc: [email protected]
> >Signed-off-by: Ingo Molnar <[email protected]>
> >---
> > arch/x86/mm/init.c | 23 ++++++++++-------------
> > 1 file changed, 10 insertions(+), 13 deletions(-)
> >
> >diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
> >index 8704153f2675..6dc85d51cd98 100644
> >--- a/arch/x86/mm/init.c
> >+++ b/arch/x86/mm/init.c
> >@@ -131,29 +131,18 @@ void __init early_alloc_pgt_buf(void)
> >
> > int after_bootmem;
> >
> >-static int page_size_mask;
> >-
> > early_param_on_off("gbpages", "nogbpages", direct_gbpages,
> > CONFIG_X86_DIRECT_GBPAGES);
> >
> >-static void __init init_gbpages(void)
> >-{
> >- if (direct_gbpages && cpu_has_gbpages) {
> >- printk(KERN_INFO "Using GB pages for direct mapping\n");
> >- page_size_mask |= 1 << PG_LEVEL_1G;
> >- } else
> >- direct_gbpages = 0;
> >-}
> >-
> > struct map_range {
> > unsigned long start;
> > unsigned long end;
> > unsigned page_size_mask;
> > };
> >
> >+static int page_size_mask;
> >+
> > static void __init probe_page_size_mask(void)
> > {
> >- init_gbpages();
> >-
> > #if !defined(CONFIG_DEBUG_PAGEALLOC) && !defined(CONFIG_KMEMCHECK)
> > /*
> > * For CONFIG_DEBUG_PAGEALLOC, identity mapping will use small pages.
> >@@ -173,6 +162,14 @@ static void __init probe_page_size_mask(void)
> > cr4_set_bits_and_update_boot(X86_CR4_PGE);
> > __supported_pte_mask |= _PAGE_GLOBAL;
> > }
> >+
> >+ /* Enable 1 GB linear kernel mappings if available: */
> >+ if (direct_gbpages && cpu_has_gbpages) {
> >+ printk(KERN_INFO "Using GB pages for direct mapping\n");
>
> pr_info()?
Yeah - probably in a separate patch, as there's three other KERN_
users in arch/x86/mm/init.c.
Thanks,
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
