On Tue, Apr 21, 2020 at 10:17:07AM +0100, Will Deacon wrote:
> Both kvm/{arm,handle_exit}.c include trace.h and attempt to instantiate
> the same tracepoints, resulting in failures at link-time:
>
> | aarch64-linux-gnu-ld: arch/arm64/kvm/handle_exit.o:(__tracepoints+0x30):
> | multiple definition of `__tracepoint_kvm_wfx_arm64';
> | arch/arm64/kvm/arm.o:(__tracepoints+0x510): first defined here
> | ...
>
> Split trace.h into two files so that the tracepoints are only created
> in the C files that use them.
>
> Cc: Marc Zyngier <maz@xxxxxxxxxx>
> Signed-off-by: Will Deacon <will@xxxxxxxxxx>
> ---
>
> Applies against kvm-arm64/welcome-home. Probably worth just folding in
> to the only commit on that branch.
I also just noticed that you forgot to update MAINTAINERS after the move,
so you can fold in the diff below as well.
Will
--->8
diff --git a/MAINTAINERS b/MAINTAINERS
index e64e5db31497..7bff7e94a930 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9299,7 +9299,6 @@ F: arch/arm64/include/asm/kvm*
F: arch/arm64/include/uapi/asm/kvm*
F: arch/arm64/kvm/
F: include/kvm/arm_*
-F: virt/kvm/arm/
KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
L: linux-mips@xxxxxxxxxxxxxxx
_______________________________________________
kvmarm mailing list
kvmarm@xxxxxxxxxxxxxxxxxxxxx
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
