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

Commit dc961e53 authored by Jia He's avatar Jia He Committed by Marc Zyngier
Browse files

KVM: arm/arm64: vgic: Move DEBUG_SPINLOCK_BUG_ON to vgic.h 



DEBUG_SPINLOCK_BUG_ON can be used with both vgic-v2 and vgic-v3,
so let's move it to vgic.h

Signed-off-by: default avatarJia He <jia.he@hxt-semitech.com>
[maz: commit message tidy-up]
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 3e8a8a50

virt/kvm/arm/vgic/vgic.c

+0 −6
Original line number Diff line number Diff line
@@ -28,12 +28,6 @@ 
#define CREATE_TRACE_POINTS

#include "trace.h"



#ifdef CONFIG_DEBUG_SPINLOCK

#define DEBUG_SPINLOCK_BUG_ON(p) BUG_ON(p)

#else

#define DEBUG_SPINLOCK_BUG_ON(p)

#endif



struct vgic_global kvm_vgic_global_state __ro_after_init = {

	.gicv3_cpuif = STATIC_KEY_FALSE_INIT,

};

virt/kvm/arm/vgic/vgic.h

+6 −0
Original line number Diff line number Diff line
@@ -103,6 +103,12 @@ 
#define KVM_VGIC_V3_RDIST_COUNT_MASK	GENMASK_ULL(63, 52)

#define KVM_VGIC_V3_RDIST_COUNT_SHIFT	52



#ifdef CONFIG_DEBUG_SPINLOCK

#define DEBUG_SPINLOCK_BUG_ON(p) BUG_ON(p)

#else

#define DEBUG_SPINLOCK_BUG_ON(p)

#endif



/* Requires the irq_lock to be held by the caller. */

static inline bool irq_is_pending(struct vgic_irq *irq)

{