diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-05-16 15:59:00 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-05-16 15:59:00 +0300 |
| commit | a158f2b79ff1948c864a38296ea4249f7296362b (patch) | |
| tree | e62d50376d29a63814cf9d26cbd4c522f6f9271a /arch/x86/events/intel/pt.h | |
| parent | 581abbaa03367f0b1327521f30bd2b69b8075b2f (diff) | |
| parent | 515511a7920c69aebf7f5fef0cb8e1df6767f34c (diff) | |
| download | linux-a158f2b79ff1948c864a38296ea4249f7296362b.tar.xz | |
Merge tag 'asoc-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v4.7
The updates this time around are almost all driver code:
- Further slow progress on the topology code.
- Substantial updates and improvements for the da7219, es8328, fsl-ssi
Intel and rcar drivers.
Diffstat (limited to 'arch/x86/events/intel/pt.h')
| -rw-r--r-- | arch/x86/events/intel/pt.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/events/intel/pt.h b/arch/x86/events/intel/pt.h index 336878a5d205..3abb5f5cccc8 100644 --- a/arch/x86/events/intel/pt.h +++ b/arch/x86/events/intel/pt.h @@ -65,6 +65,7 @@ enum pt_capabilities { struct pt_pmu { struct pmu pmu; u32 caps[PT_CPUID_REGS_NUM * PT_CPUID_LEAVES]; + bool vmx; }; /** @@ -107,10 +108,12 @@ struct pt_buffer { * struct pt - per-cpu pt context * @handle: perf output handle * @handle_nmi: do handle PT PMI on this cpu, there's an active event + * @vmx_on: 1 if VMX is ON on this cpu */ struct pt { struct perf_output_handle handle; int handle_nmi; + int vmx_on; }; #endif /* __INTEL_PT_H__ */ |