diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-13 10:28:43 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-13 10:28:43 +0200 |
commit | d6fd520355f1d3a9fd806285190654fb4aed84b6 (patch) | |
tree | 668602ceb0ea8de9f088198fcce2da0bcd9c45b0 /ARM-KVM-Fix-tracepoint-generation-after-move-to-virt-kvm-arm.patch | |
parent | 0695f06e29170d1ad1c8369303526dedb4e1ac4b (diff) | |
parent | bf590656f4bcf3aabc56f78ed7de8dbc55988156 (diff) | |
download | kernel-4.12.0-0.rc0.git9.1.vanilla.knurd.1.fc27.tar.gz kernel-4.12.0-0.rc0.git9.1.vanilla.knurd.1.fc27.tar.xz kernel-4.12.0-0.rc0.git9.1.vanilla.knurd.1.fc27.zip |
Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc0.git9.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc0.git9.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc0.git9.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc0.git9.1.vanilla.knurd.1.fc24
Diffstat (limited to 'ARM-KVM-Fix-tracepoint-generation-after-move-to-virt-kvm-arm.patch')
-rw-r--r-- | ARM-KVM-Fix-tracepoint-generation-after-move-to-virt-kvm-arm.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/ARM-KVM-Fix-tracepoint-generation-after-move-to-virt-kvm-arm.patch b/ARM-KVM-Fix-tracepoint-generation-after-move-to-virt-kvm-arm.patch new file mode 100644 index 000000000..af2a3dfc2 --- /dev/null +++ b/ARM-KVM-Fix-tracepoint-generation-after-move-to-virt-kvm-arm.patch @@ -0,0 +1,65 @@ +From patchwork Fri May 12 10:04:52 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: ARM: KVM: Fix tracepoint generation after move to virt/kvm/arm/ +From: Marc Zyngier <Marc.Zyngier@arm.com> +X-Patchwork-Id: 9723825 +Message-Id: <20170512100452.8245-1-marc.zyngier@arm.com> +To: Christoffer Dall <christoffer.dall@linaro.org> +Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, + linux-arm-kernel@lists.infradead.org, arnd@arndb.de +Date: Fri, 12 May 2017 11:04:52 +0100 + +Moving most of the shared code to virt/kvm/arm had for consequence +that KVM/ARM doesn't build anymore, because the code that used to +define the tracepoints is now somewhere else. + +Fix this by defining CREATE_TRACE_POINTS in coproc.c, and clean-up +trace.h as well. + +Fixes: 35d2d5d490e2 ("KVM: arm/arm64: Move shared files to virt/kvm/arm") +Reported-by: Arnd Bergmann <arnd@arndb.de> +Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> +--- + arch/arm/kvm/coproc.c | 1 + + arch/arm/kvm/trace.h | 8 ++++---- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c +index 2c14b69511e9..ac8d36da4d08 100644 +--- a/arch/arm/kvm/coproc.c ++++ b/arch/arm/kvm/coproc.c +@@ -32,6 +32,7 @@ + #include <asm/vfp.h> + #include "../vfp/vfpinstr.h" + ++#define CREATE_TRACE_POINTS + #include "trace.h" + #include "coproc.h" + +diff --git a/arch/arm/kvm/trace.h b/arch/arm/kvm/trace.h +index fc0943776db2..b0d10648c486 100644 +--- a/arch/arm/kvm/trace.h ++++ b/arch/arm/kvm/trace.h +@@ -1,5 +1,5 @@ +-#if !defined(_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ) +-#define _TRACE_KVM_H ++#if !defined(_TRACE_ARM_KVM_H) || defined(TRACE_HEADER_MULTI_READ) ++#define _TRACE_ARM_KVM_H + + #include <linux/tracepoint.h> + +@@ -74,10 +74,10 @@ TRACE_EVENT(kvm_hvc, + __entry->vcpu_pc, __entry->r0, __entry->imm) + ); + +-#endif /* _TRACE_KVM_H */ ++#endif /* _TRACE_ARM_KVM_H */ + + #undef TRACE_INCLUDE_PATH +-#define TRACE_INCLUDE_PATH arch/arm/kvm ++#define TRACE_INCLUDE_PATH . + #undef TRACE_INCLUDE_FILE + #define TRACE_INCLUDE_FILE trace + |