mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot for Kirill A. Shutemov" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: mingo@kernel.org, kirill.shutemov@linux.intel.com,
	linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com
Subject: [tip:x86/urgent] x86/mm: Fix 'no5lvl' handling
Date: Sat, 23 Jun 2018 05:31:20 -0700	[thread overview]
Message-ID: <tip-2458e53ff74cd1063ed3e00459da1d35c559d369@git.kernel.org> (raw)
In-Reply-To: <20180622220841.54135-3-kirill.shutemov@linux.intel.com>

Commit-ID:  2458e53ff74cd1063ed3e00459da1d35c559d369
Gitweb:     https://git.kernel.org/tip/2458e53ff74cd1063ed3e00459da1d35c559d369
Author:     Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
AuthorDate: Sat, 23 Jun 2018 01:08:41 +0300
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Sat, 23 Jun 2018 14:20:37 +0200

x86/mm: Fix 'no5lvl' handling

early_identify_cpu() has to use early version of pgtable_l5_enabled()
that doesn't rely on cpu_feature_enabled().

Defining USE_EARLY_PGTABLE_L5 before all includes does the trick.

I lost the define in one of reworks of the original patch.

Fixes: 372fddf70904 ("x86/mm: Introduce the 'no5lvl' kernel parameter")
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Link: https://lkml.kernel.org/r/20180622220841.54135-3-kirill.shutemov@linux.intel.com

---
 arch/x86/kernel/cpu/common.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 0df7151cfef4..eb4cb3efd20e 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1,3 +1,6 @@
+/* cpu_feature_enabled() cannot be used this early */
+#define USE_EARLY_PGTABLE_L5
+
 #include <linux/bootmem.h>
 #include <linux/linkage.h>
 #include <linux/bitops.h>

      reply	other threads:[~2018-06-23 12:31 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-22 22:08 [PATCH 0/2] x86/mm: Fix 'no5lvl' handling in v4.18-rc1 Kirill A. Shutemov
2018-06-22 22:08 ` [PATCH 1/2] Revert "x86/mm: Mark __pgtable_l5_enabled __initdata" Kirill A. Shutemov
2018-06-23 12:30   ` [tip:x86/urgent] " tip-bot for Kirill A. Shutemov
2018-06-22 22:08 ` [PATCH 2/2] x86/mm: Fix 'no5lvl' handling Kirill A. Shutemov
2018-06-23 12:31   ` tip-bot for Kirill A. Shutemov [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-2458e53ff74cd1063ed3e00459da1d35c559d369@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=hpa@zytor.com \
    --cc=kirill.shutemov@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®