Skip to contentSkip to conversation

tools headers uapi: Sync powerpc's asm/kvm.h copy with the kernel sources

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Mar 29, 2019

lore
Share & tools
lore
#0 lore raw
Commit-ID:  707c373c846cf6e27a47a2c093d243a35c691b62
Gitweb:     https://git.kernel.org/tip/707c373c846cf6e27a47a2c093d243a35c691b62
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Tue, 26 Mar 2019 13:45:58 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 28 Mar 2019 14:41:21 -0300

tools headers uapi: Sync powerpc's asm/kvm.h copy with the kernel sources

To pick up the changes in:

2b57ecd0208f ("KVM: PPC: Book3S: Add count cache flush parameters to kvmppc_get_cpu_char()")

That don't cause any changes in the tools.

This silences this perf build warning:

Warning: Kernel ABI header at 'tools/arch/powerpc/include/uapi/asm/kvm.h' differs from latest version at 'arch/powerpc/include/uapi/asm/kvm.h' diff -u tools/arch/powerpc/include/uapi/asm/kvm.h arch/powerpc/include/uapi/asm/kvm.h

---
 tools/arch/powerpc/include/uapi/asm/kvm.h | 2 ++
 1 file changed, 2 insertions(+)
tools/arch/powerpc/include/uapi/asm/kvm.h +2 -0
index 8c876c166ef2..26ca425f4c2c 100644
@@ -463,10 +463,12 @@ struct kvm_ppc_cpu_char {
 #define KVM_PPC_CPU_CHAR_BR_HINT_HONOURED	(1ULL << 58)
 #define KVM_PPC_CPU_CHAR_MTTRIG_THR_RECONF	(1ULL << 57)
 #define KVM_PPC_CPU_CHAR_COUNT_CACHE_DIS	(1ULL << 56)
+#define KVM_PPC_CPU_CHAR_BCCTR_FLUSH_ASSIST	(1ull << 54)
 
 #define KVM_PPC_CPU_BEHAV_FAVOUR_SECURITY	(1ULL << 63)
 #define KVM_PPC_CPU_BEHAV_L1D_FLUSH_PR		(1ULL << 62)
 #define KVM_PPC_CPU_BEHAV_BNDS_CHK_SPEC_BAR	(1ULL << 61)
+#define KVM_PPC_CPU_BEHAV_FLUSH_COUNT_CACHE	(1ull << 58)
 
 /* Per-vcpu XICS interrupt controller state */
 #define KVM_REG_PPC_ICP_STATE	(KVM_REG_PPC | KVM_REG_SIZE_U64 | 0x8c)