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

Commit cc8f3b4d authored by Zhenzhong Duan's avatar Zhenzhong Duan Committed by Juergen Gross
Browse files

x86/paravirt: Remove const mark from x86_hyper_xen_hvm variable 



.. as "nopv" support needs it to be changeable at boot up stage.

Checkpatch reports warning, so move variable declarations from
hypervisor.c to hypervisor.h

Signed-off-by: default avatarZhenzhong Duan <zhenzhong.duan@oracle.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent b39b0497

arch/x86/include/asm/hypervisor.h

+8 −0
Original line number Diff line number Diff line
@@ -58,6 +58,14 @@ struct hypervisor_x86 { 
	bool ignore_nopv;

};



extern const struct hypervisor_x86 x86_hyper_vmware;

extern const struct hypervisor_x86 x86_hyper_ms_hyperv;

extern const struct hypervisor_x86 x86_hyper_xen_pv;

extern const struct hypervisor_x86 x86_hyper_kvm;

extern const struct hypervisor_x86 x86_hyper_jailhouse;

extern const struct hypervisor_x86 x86_hyper_acrn;

extern struct hypervisor_x86 x86_hyper_xen_hvm;



extern bool nopv;

extern enum x86_hypervisor_type x86_hyper_type;

extern void init_hypervisor_platform(void);

arch/x86/kernel/cpu/hypervisor.c

+0 −8
Original line number Diff line number Diff line
@@ -26,14 +26,6 @@ 
#include <asm/processor.h>

#include <asm/hypervisor.h>



extern const struct hypervisor_x86 x86_hyper_vmware;

extern const struct hypervisor_x86 x86_hyper_ms_hyperv;

extern const struct hypervisor_x86 x86_hyper_xen_pv;

extern const struct hypervisor_x86 x86_hyper_xen_hvm;

extern const struct hypervisor_x86 x86_hyper_kvm;

extern const struct hypervisor_x86 x86_hyper_jailhouse;

extern const struct hypervisor_x86 x86_hyper_acrn;



static const __initconst struct hypervisor_x86 * const hypervisors[] =

{

#ifdef CONFIG_XEN_PV

arch/x86/xen/enlighten_hvm.c

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static __init void xen_hvm_guest_late_init(void) 
#endif

}



const __initconst struct hypervisor_x86 x86_hyper_xen_hvm = {

struct hypervisor_x86 x86_hyper_xen_hvm __initdata = {

	.name                   = "Xen HVM",

	.detect                 = xen_platform_hvm,

	.type			= X86_HYPER_XEN_HVM,