Skip to content

Commit 707c373

Browse files
committed
tools headers uapi: Sync powerpc's asm/kvm.h copy with the kernel sources
To pick up the changes in: 2b57ecd ("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 Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@ozlabs.org> Cc: Suraj Jitindar Singh <sjitindarsingh@gmail.com> Link: https://lkml.kernel.org/n/tip-4pb7ywp9536hub2pnj4hu6i4@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 8142bd8 commit 707c373

File tree

1 file changed

+2
-0
lines changed
  • tools/arch/powerpc/include/uapi/asm

1 file changed

+2
-0
lines changed

tools/arch/powerpc/include/uapi/asm/kvm.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,10 +463,12 @@ struct kvm_ppc_cpu_char {
463463
#define KVM_PPC_CPU_CHAR_BR_HINT_HONOURED (1ULL << 58)
464464
#define KVM_PPC_CPU_CHAR_MTTRIG_THR_RECONF (1ULL << 57)
465465
#define KVM_PPC_CPU_CHAR_COUNT_CACHE_DIS (1ULL << 56)
466+
#define KVM_PPC_CPU_CHAR_BCCTR_FLUSH_ASSIST (1ull << 54)
466467

467468
#define KVM_PPC_CPU_BEHAV_FAVOUR_SECURITY (1ULL << 63)
468469
#define KVM_PPC_CPU_BEHAV_L1D_FLUSH_PR (1ULL << 62)
469470
#define KVM_PPC_CPU_BEHAV_BNDS_CHK_SPEC_BAR (1ULL << 61)
471+
#define KVM_PPC_CPU_BEHAV_FLUSH_COUNT_CACHE (1ull << 58)
470472

471473
/* Per-vcpu XICS interrupt controller state */
472474
#define KVM_REG_PPC_ICP_STATE (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0x8c)

0 commit comments

Comments
 (0)