Commit 867fe800 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by Ingo Molnar
Browse files

x86/paravirt: Remove paravirt_enabled() 



Now that all previous paravirt_enabled() uses were replaced with proper
x86 semantics by the previous patches we can remove the unused
paravirt_enabled() mechanism.

Signed-off-by: default avatarLuis R. Rodriguez <mcgrof@kernel.org>
Acked-by: default avatarJuergen Gross <jgross@suse.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: andrew.cooper3@citrix.com
Cc: andriy.shevchenko@linux.intel.com
Cc: bigeasy@linutronix.de
Cc: boris.ostrovsky@oracle.com
Cc: david.vrabel@citrix.com
Cc: ffainelli@freebox.fr
Cc: george.dunlap@citrix.com
Cc: glin@suse.com
Cc: jlee@suse.com
Cc: josh@joshtriplett.org
Cc: julien.grall@linaro.org
Cc: konrad.wilk@oracle.com
Cc: kozerkov@parallels.com
Cc: lenb@kernel.org
Cc: lguest@lists.ozlabs.org
Cc: linux-acpi@vger.kernel.org
Cc: lv.zheng@intel.com
Cc: matt@codeblueprint.co.uk
Cc: mbizon@freebox.fr
Cc: rjw@rjwysocki.net
Cc: robert.moore@intel.com
Cc: rusty@rustcorp.com.au
Cc: tiwai@suse.de
Cc: toshi.kani@hp.com
Cc: xen-devel@lists.xensource.com
Link: http://lkml.kernel.org/r/1460592286-300-15-git-send-email-mcgrof@kernel.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent f2d85299

arch/x86/include/asm/paravirt.h

+0 −5
Original line number Diff line number Diff line
@@ -15,11 +15,6 @@ 
#include <linux/cpumask.h>

#include <asm/frame.h>



static inline int paravirt_enabled(void)

{

	return pv_info.paravirt_enabled;

}



static inline void load_sp0(struct tss_struct *tss,

			     struct thread_struct *thread)

{

arch/x86/include/asm/paravirt_types.h

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ struct pv_info { 
	u16 extra_user_64bit_cs;  /* __USER_CS if none */

#endif



	int paravirt_enabled;

	const char *name;

};

arch/x86/include/asm/processor.h

+0 −1
Original line number Diff line number Diff line
@@ -473,7 +473,6 @@ static inline unsigned long current_top_of_stack(void) 
#include <asm/paravirt.h>

#else

#define __cpuid			native_cpuid

#define paravirt_enabled()	0



static inline void load_sp0(struct tss_struct *tss,

			    struct thread_struct *thread)

arch/x86/kernel/kvm.c

+0 −8
Original line number Diff line number Diff line
@@ -285,14 +285,6 @@ static void __init paravirt_ops_setup(void) 
{

	pv_info.name = "KVM";



	/*

	 * KVM isn't paravirt in the sense of paravirt_enabled.  A KVM

	 * guest kernel works like a bare metal kernel with additional

	 * features, and paravirt_enabled is about features that are

	 * missing.

	 */

	pv_info.paravirt_enabled = 0;



	if (kvm_para_has_feature(KVM_FEATURE_NOP_IO_DELAY))

		pv_cpu_ops.io_delay = kvm_io_delay;

arch/x86/kernel/paravirt.c

+0 −1
Original line number Diff line number Diff line
@@ -294,7 +294,6 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void) 


struct pv_info pv_info = {

	.name = "bare hardware",

	.paravirt_enabled = 0,

	.kernel_rpl = 0,

	.shared_kernel_pmd = 1,	/* Only used when CONFIG_X86_PAE is set */

CRA Git | Maintained and supported by SUSTech CRA and CCSE