summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/paravirt.h
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2016-02-02 13:23:36 +1100
committerJoel Stanley <joel@jms.id.au>2016-02-02 13:23:42 +1100
commitf3f4aeb9ea8954c0da3cf0d12693f9a57f1f4ac7 (patch)
tree3663ab29736373c565d88e941162d37311cc3c75 /arch/x86/include/asm/paravirt.h
parent2a3f5f14fdf2e8fb680af168fa642ef8a9218ffb (diff)
parent849a2d3d9be31368559e6852cf64d749e6903818 (diff)
downloadtalos-obmc-linux-openbmc-20160202-1.tar.gz
talos-obmc-linux-openbmc-20160202-1.zip
Merge tag 'v4.3.5' into dev-4.3openbmc-20160202-1
This is the 4.3.5 stable release Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'arch/x86/include/asm/paravirt.h')
-rw-r--r--arch/x86/include/asm/paravirt.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index 10d0596433f8..c759b3cca663 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -19,6 +19,12 @@ static inline int paravirt_enabled(void)
return pv_info.paravirt_enabled;
}
+static inline int paravirt_has_feature(unsigned int feature)
+{
+ WARN_ON_ONCE(!pv_info.paravirt_enabled);
+ return (pv_info.features & feature);
+}
+
static inline void load_sp0(struct tss_struct *tss,
struct thread_struct *thread)
{
OpenPOWER on IntegriCloud