Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01630ab8 authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

ARM: KVM: Fix tracepoint generation after move to virt/kvm/arm/ 



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: 35d2d5d4 ("KVM: arm/arm64: Move shared files to virt/kvm/arm")
Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <cdall@linaro.org>
parent 2ea659a9

arch/arm/kvm/coproc.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <asm/vfp.h>

#include <asm/vfp.h>

#include "../vfp/vfpinstr.h"

#include "../vfp/vfpinstr.h"





#define CREATE_TRACE_POINTS

#include "trace.h"

#include "trace.h"

#include "coproc.h"

#include "coproc.h"

arch/arm/kvm/trace.h

+4 −4
Original line number Original line Diff line number Diff line 
#if !defined(_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ)

#if !defined(_TRACE_ARM_KVM_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_KVM_H

#define _TRACE_ARM_KVM_H





#include <linux/tracepoint.h>

#include <linux/tracepoint.h>
@@ -74,10 +74,10 @@ TRACE_EVENT(kvm_hvc, 
		  __entry->vcpu_pc, __entry->r0, __entry->imm)

		  __entry->vcpu_pc, __entry->r0, __entry->imm)

);

);





#endif /* _TRACE_KVM_H */

#endif /* _TRACE_ARM_KVM_H */





#undef TRACE_INCLUDE_PATH

#undef TRACE_INCLUDE_PATH

#define TRACE_INCLUDE_PATH arch/arm/kvm

#define TRACE_INCLUDE_PATH .

#undef TRACE_INCLUDE_FILE

#undef TRACE_INCLUDE_FILE

#define TRACE_INCLUDE_FILE trace

#define TRACE_INCLUDE_FILE trace