From: tip-bot for Peter Zijlstra <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org,
joe.konno@linux.intel.com, mingo@kernel.org,
peterz@infradead.org, hpa@zytor.com,
torvalds@linux-foundation.org
Subject: [tip:x86/pti] x86/speculation: Add <asm/msr-index.h> dependency
Date: Tue, 13 Feb 2018 07:26:23 -0800 [thread overview]
Message-ID: <tip-30d97b098534d1d35b198531870356a29cc066c2@git.kernel.org> (raw)
In-Reply-To: <20180213132819.GJ25201@hirez.programming.kicks-ass.net>
Commit-ID: 30d97b098534d1d35b198531870356a29cc066c2
Gitweb: https://git.kernel.org/tip/30d97b098534d1d35b198531870356a29cc066c2
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Tue, 13 Feb 2018 14:28:19 +0100
Committer: Ingo Molnar <mingo@kernel.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@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: arjan@linux.intel.com
Cc: bp@alien8.de
Cc: dan.j.williams@intel.com
Cc: dave.hansen@linux.intel.com
Cc: dwmw2@infradead.org
Cc: dwmw@amazon.co.uk
Cc: gregkh@linuxfoundation.org
Cc: hpa@zytor.com
Cc: jpoimboe@redhat.com
Cc: linux-tip-commits@vger.kernel.org
Cc: luto@kernel.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@kernel.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__
next prev parent reply other threads:[~2018-02-13 15:37 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-10 23:39 [PATCH v2 0/6] Spectre v2 updates David Woodhouse
2018-02-10 23:39 ` [PATCH v2 1/6] x86/speculation: Update Speculation Control microcode blacklist David Woodhouse
2018-02-11 12:08 ` [tip:x86/pti] " tip-bot for David Woodhouse
2018-02-12 9:50 ` [PATCH v2 1/6] " Darren Kenny
2018-02-12 14:16 ` David Woodhouse
2018-02-12 14:32 ` Thomas Gleixner
2018-02-10 23:39 ` [PATCH v2 2/6] Revert "x86/speculation: Simplify indirect_branch_prediction_barrier()" David Woodhouse
2018-02-11 12:09 ` [tip:x86/pti] " tip-bot for David Woodhouse
2018-02-13 8:58 ` tip-bot for David Woodhouse
2018-02-13 9:41 ` Peter Zijlstra
2018-02-13 11:28 ` Ingo Molnar
2018-02-13 13:28 ` Peter Zijlstra
2018-02-13 13:38 ` Ingo Molnar
2018-02-13 15:26 ` tip-bot for Peter Zijlstra [this message]
2018-02-15 0:28 ` [tip:x86/pti] x86/speculation: Add <asm/msr-index.h> dependency tip-bot for Peter Zijlstra
2018-02-10 23:39 ` [PATCH v2 3/6] KVM: x86: Reduce retpoline performance impact in slot_handle_level_range() David Woodhouse
2018-02-11 12:09 ` [tip:x86/pti] KVM/x86: Reduce retpoline performance impact in slot_handle_level_range(), by always inlining iterator helper methods tip-bot for David Woodhouse
2018-02-13 8:58 ` tip-bot for David Woodhouse
2018-02-10 23:39 ` [PATCH v2 4/6] X86/nVMX: Properly set spec_ctrl and pred_cmd before merging MSRs David Woodhouse
2018-02-11 12:10 ` [tip:x86/pti] " tip-bot for KarimAllah Ahmed
2018-02-13 8:59 ` tip-bot for KarimAllah Ahmed
2018-02-10 23:39 ` [PATCH v2 5/6] KVM/nVMX: Set the CPU_BASED_USE_MSR_BITMAPS if we have a valid L02 MSR bitmap David Woodhouse
2018-02-11 10:19 ` Ingo Molnar
[not found] ` <1518345844.3677.365.camel@amazon.co.uk>
2018-02-11 10:55 ` Ingo Molnar
2018-02-11 12:10 ` [tip:x86/pti] " tip-bot for KarimAllah Ahmed
2018-02-13 8:59 ` tip-bot for KarimAllah Ahmed
2018-02-10 23:39 ` [PATCH v2 6/6] x86/speculation: Use IBRS if available before calling into firmware David Woodhouse
2018-02-11 11:46 ` Ingo Molnar
2018-02-11 10:41 ` [PATCH v2 0/6] Spectre v2 updates Ingo Molnar
2018-02-11 15:19 ` [PATCH v2.1] x86/speculation: Use IBRS if available before calling into firmware David Woodhouse
2018-02-11 18:50 ` [PATCH] x86/speculation: Clean up various Spectre related details Ingo Molnar
2018-02-11 19:25 ` David Woodhouse
2018-02-11 19:43 ` Ingo Molnar
2018-02-12 15:30 ` David Woodhouse
2018-02-13 8:04 ` Ingo Molnar
2018-02-11 19:19 ` [tip:x86/pti] x86/speculation: Use IBRS if available before calling into firmware tip-bot for David Woodhouse
2018-02-12 5:59 ` afzal mohammed
2018-02-12 16:30 ` David Woodhouse
2018-02-12 10:22 ` Ingo Molnar
2018-02-12 11:50 ` Peter Zijlstra
2018-02-12 12:27 ` David Woodhouse
2018-02-12 13:06 ` Peter Zijlstra
2018-02-13 7:58 ` Ingo Molnar
2018-02-12 12:28 ` Peter Zijlstra
2018-02-12 16:13 ` Dave Hansen
2018-02-12 16:58 ` Peter Zijlstra
2018-02-13 7:55 ` Ingo Molnar
2018-02-14 1:49 ` Tim Chen
2018-02-14 8:56 ` Peter Zijlstra
2018-02-14 8:57 ` Peter Zijlstra
2018-02-14 19:20 ` Tim Chen
2018-02-14 23:19 ` Ingo Molnar
2018-02-15 2:01 ` Tim Chen
2018-02-14 9:31 ` [PATCH] watchdog: hpwdt: Remove spinlock acquire and BIOS calls from NMI context Ingo Molnar
2018-02-14 9:38 ` Peter Zijlstra
2018-02-14 10:39 ` Ingo Molnar
2018-02-14 9:44 ` Borislav Petkov
2018-02-14 18:13 ` Jerry Hoemann
2018-02-14 23:17 ` Ingo Molnar
2018-02-15 17:44 ` Jerry Hoemann
2018-02-15 19:02 ` Ingo Molnar
2018-02-15 19:48 ` Peter Zijlstra
2018-02-16 18:44 ` [tip:x86/pti] x86/speculation: Use IBRS if available before calling into firmware Tim Chen
2018-02-16 19:16 ` David Woodhouse
2018-02-16 23:46 ` Tim Chen
2018-02-17 10:26 ` Ingo Molnar
2018-02-19 9:20 ` Peter Zijlstra
2018-02-19 9:29 ` David Woodhouse
2018-02-19 9:39 ` Ingo Molnar
2018-02-19 9:44 ` David Woodhouse
2018-02-19 10:08 ` Peter Zijlstra
2018-02-19 9:36 ` Ingo Molnar
2018-02-12 8:27 ` [PATCH v2 0/6] Spectre v2 updates Paolo Bonzini
2018-02-13 7:59 ` Ingo Molnar
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-30d97b098534d1d35b198531870356a29cc066c2@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=joe.konno@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.