[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-30d97b098534d1d35b198531870356a29cc066c2@git.kernel.org>
Date: Tue, 13 Feb 2018 07:26:23 -0800
From: tip-bot for Peter Zijlstra <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: tglx@...utronix.de, linux-kernel@...r.kernel.org,
joe.konno@...ux.intel.com, mingo@...nel.org, peterz@...radead.org,
hpa@...or.com, torvalds@...ux-foundation.org
Subject: [tip:x86/pti] x86/speculation: Add <asm/msr-index.h> dependency
Commit-ID: 30d97b098534d1d35b198531870356a29cc066c2
Gitweb: https://git.kernel.org/tip/30d97b098534d1d35b198531870356a29cc066c2
Author: Peter Zijlstra <peterz@...radead.org>
AuthorDate: Tue, 13 Feb 2018 14:28:19 +0100
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Tue, 13 Feb 2018 14:39:34 +0100
x86/speculation: Add <asm/msr-index.h> dependency
Joe Konno reported a compile failure resulting from using an MSR
without inclusion of <asm/msr-index.h>, and while the current code builds
fine (by accident) this needs fixing for future patches.
Reported-by: Joe Konno <joe.konno@...ux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: arjan@...ux.intel.com
Cc: bp@...en8.de
Cc: dan.j.williams@...el.com
Cc: dave.hansen@...ux.intel.com
Cc: dwmw2@...radead.org
Cc: dwmw@...zon.co.uk
Cc: gregkh@...uxfoundation.org
Cc: hpa@...or.com
Cc: jpoimboe@...hat.com
Cc: linux-tip-commits@...r.kernel.org
Cc: luto@...nel.org
Fixes: 20ffa1caecca ("x86/speculation: Add basic IBPB (Indirect Branch Prediction Barrier) support")
Link: http://lkml.kernel.org/r/20180213132819.GJ25201@hirez.programming.kicks-ass.net
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/include/asm/nospec-branch.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h
index 300cc15..76b0585 100644
--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
@@ -6,6 +6,7 @@
#include <asm/alternative.h>
#include <asm/alternative-asm.h>
#include <asm/cpufeatures.h>
+#include <asm/msr-index.h>
#ifdef __ASSEMBLY__
Powered by blists - more mailing lists