All of lore.kernel.org
 help / color / mirror / Atom feed
* [tip: perf/urgent] tools headers kvm: Sync kvm headers with the kernel sources
@ 2020-02-15  8:41 tip-bot2 for Arnaldo Carvalho de Melo
  0 siblings, 0 replies; 5+ messages in thread
From: tip-bot2 for Arnaldo Carvalho de Melo @ 2020-02-15  8:41 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: Adrian Hunter, Andrew Jones, Jiri Olsa, Marc Zyngier,
	Namhyung Kim, Arnaldo Carvalho de Melo, x86, LKML

The following commit has been merged into the perf/urgent branch of tip:

Commit-ID:     391df72fbd144878e2f905d86f1e9a85a059216a
Gitweb:        https://git.kernel.org/tip/391df72fbd144878e2f905d86f1e9a85a059216a
Author:        Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate:    Wed, 12 Feb 2020 12:41:20 -03:00
Committer:     Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Wed, 12 Feb 2020 12:41:20 -03:00

tools headers kvm: Sync kvm headers with the kernel sources

To pick up the changes from:

  290a6bb06de9 ("arm64: KVM: Add UAPI notes for swapped registers")

No tools changes are caused by this.

This addresses these tools/perf build warnings:

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andrew Jones <drjones@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/arch/arm64/include/uapi/asm/kvm.h | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tools/arch/arm64/include/uapi/asm/kvm.h b/tools/arch/arm64/include/uapi/asm/kvm.h
index 820e575..ba85bb2 100644
--- a/tools/arch/arm64/include/uapi/asm/kvm.h
+++ b/tools/arch/arm64/include/uapi/asm/kvm.h
@@ -220,10 +220,18 @@ struct kvm_vcpu_events {
 #define KVM_REG_ARM_PTIMER_CVAL		ARM64_SYS_REG(3, 3, 14, 2, 2)
 #define KVM_REG_ARM_PTIMER_CNT		ARM64_SYS_REG(3, 3, 14, 0, 1)
 
-/* EL0 Virtual Timer Registers */
+/*
+ * EL0 Virtual Timer Registers
+ *
+ * WARNING:
+ *      KVM_REG_ARM_TIMER_CVAL and KVM_REG_ARM_TIMER_CNT are not defined
+ *      with the appropriate register encodings.  Their values have been
+ *      accidentally swapped.  As this is set API, the definitions here
+ *      must be used, rather than ones derived from the encodings.
+ */
 #define KVM_REG_ARM_TIMER_CTL		ARM64_SYS_REG(3, 3, 14, 3, 1)
-#define KVM_REG_ARM_TIMER_CNT		ARM64_SYS_REG(3, 3, 14, 3, 2)
 #define KVM_REG_ARM_TIMER_CVAL		ARM64_SYS_REG(3, 3, 14, 0, 2)
+#define KVM_REG_ARM_TIMER_CNT		ARM64_SYS_REG(3, 3, 14, 3, 2)
 
 /* KVM-as-firmware specific pseudo-registers */
 #define KVM_REG_ARM_FW			(0x0014 << KVM_REG_ARM_COPROC_SHIFT)

^ permalink raw reply related	[flat|nested] 5+ messages in thread
[parent not found: <tip-qrjdudhq25mk5bfnhveofbm4@git.kernel.org>]
[parent not found: <tip-pqzkt1hmfpqph3ts8i6zzmim@git.kernel.org>]
[parent not found: <tip-akuugvvjxte26kzv23zp5d2z@git.kernel.org>]

end of thread, other threads:[~2020-02-15  8:41 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <tip-gr1eel0hckmi5l3p2ewdpfxh@git.kernel.org>
2019-10-21  6:26 ` [tip: perf/urgent] tools headers kvm: Sync kvm headers with the kernel sources tip-bot2 for Arnaldo Carvalho de Melo
2020-02-15  8:41 tip-bot2 for Arnaldo Carvalho de Melo
     [not found] <tip-qrjdudhq25mk5bfnhveofbm4@git.kernel.org>
2019-12-04  7:53 ` tip-bot2 for Arnaldo Carvalho de Melo
     [not found] <tip-pqzkt1hmfpqph3ts8i6zzmim@git.kernel.org>
2019-10-21  6:26 ` tip-bot2 for Arnaldo Carvalho de Melo
     [not found] <tip-akuugvvjxte26kzv23zp5d2z@git.kernel.org>
2019-10-07 14:49 ` tip-bot2 for Arnaldo Carvalho de Melo

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.