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

Commit 65f9d654 authored by Juergen Gross's avatar Juergen Gross
Browse files

x86/cpu: remove hypervisor specific set_cpu_features 



There is no user of x86_hyper->set_cpu_features() any more. Remove it.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent d40342a2

arch/x86/include/asm/hypervisor.h

+0 −5
Original line number Diff line number Diff line
@@ -35,9 +35,6 @@ struct hypervisor_x86 { 
	/* Detection routine */

	uint32_t	(*detect)(void);



	/* Adjust CPU feature bits (run once per CPU) */

	void		(*set_cpu_features)(struct cpuinfo_x86 *);



	/* Platform setup (run once per boot) */

	void		(*init_platform)(void);
@@ -57,12 +54,10 @@ 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 void init_hypervisor(struct cpuinfo_x86 *c);

extern void init_hypervisor_platform(void);

extern bool hypervisor_x2apic_available(void);

extern void hypervisor_pin_vcpu(int cpu);

#else

static inline void init_hypervisor(struct cpuinfo_x86 *c) { }

static inline void init_hypervisor_platform(void) { }

static inline bool hypervisor_x2apic_available(void) { return false; }

#endif /* CONFIG_HYPERVISOR_GUEST */

arch/x86/kernel/cpu/common.c

+0 −1
Original line number Diff line number Diff line
@@ -1149,7 +1149,6 @@ static void identify_cpu(struct cpuinfo_x86 *c) 
	detect_ht(c);

#endif



	init_hypervisor(c);

	x86_init_rdrand(c);

	x86_init_cache_qos(c);

	setup_pku(c);

arch/x86/kernel/cpu/hypervisor.c

+0 −8
Original line number Diff line number Diff line
@@ -63,12 +63,6 @@ detect_hypervisor_vendor(void) 
		pr_info("Hypervisor detected: %s\n", x86_hyper->name);

}



void init_hypervisor(struct cpuinfo_x86 *c)

{

	if (x86_hyper && x86_hyper->set_cpu_features)

		x86_hyper->set_cpu_features(c);

}



void __init init_hypervisor_platform(void)

{
@@ -77,8 +71,6 @@ void __init init_hypervisor_platform(void) 
	if (!x86_hyper)

		return;



	init_hypervisor(&boot_cpu_data);



	if (x86_hyper->init_platform)

		x86_hyper->init_platform();

}