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

Commit 55467dea authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by David Vrabel
Browse files

xen: change the type of xen_vcpu_id to uint32_t 



We pass xen_vcpu_id mapping information to hypercalls which require
uint32_t type so it would be cleaner to have it as uint32_t. The
initializer to -1 can be dropped as we always do the mapping before using
it and we never check the 'not set' value anyway.

Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
parent 9a035a40

arch/arm/xen/enlighten.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ DEFINE_PER_CPU(struct vcpu_info *, xen_vcpu); 
static struct vcpu_info __percpu *xen_vcpu_info;



/* Linux <-> Xen vCPU id mapping */

DEFINE_PER_CPU(int, xen_vcpu_id) = -1;

DEFINE_PER_CPU(uint32_t, xen_vcpu_id);

EXPORT_PER_CPU_SYMBOL(xen_vcpu_id);



/* These are unused until we support booting "pre-ballooned" */

arch/x86/xen/enlighten.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ DEFINE_PER_CPU(struct vcpu_info *, xen_vcpu); 
DEFINE_PER_CPU(struct vcpu_info, xen_vcpu_info);



/* Linux <-> Xen vCPU id mapping */

DEFINE_PER_CPU(int, xen_vcpu_id) = -1;

DEFINE_PER_CPU(uint32_t, xen_vcpu_id);

EXPORT_PER_CPU_SYMBOL(xen_vcpu_id);



enum xen_domain_type xen_domain_type = XEN_NATIVE;

include/xen/xen-ops.h

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 


DECLARE_PER_CPU(struct vcpu_info *, xen_vcpu);



DECLARE_PER_CPU(int, xen_vcpu_id);

static inline int xen_vcpu_nr(int cpu)

DECLARE_PER_CPU(uint32_t, xen_vcpu_id);

static inline uint32_t xen_vcpu_nr(int cpu)

{

	return per_cpu(xen_vcpu_id, cpu);

}