diff mbox

[v5,14/14] x86/paravirt: remove paravirt_enabled()

Message ID 1460158825-13117-15-git-send-email-mcgrof@kernel.org (mailing list archive)
State New, archived
Headers show

Commit Message

Luis Chamberlain April 8, 2016, 11:40 p.m. UTC 
That that paravirt_enabled() is replaced with proper
x86 semantics we can remove it.

Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
---
 arch/x86/include/asm/paravirt.h       | 5 -----
 arch/x86/include/asm/paravirt_types.h | 1 -
 arch/x86/include/asm/processor.h      | 1 -
 arch/x86/kernel/kvm.c                 | 8 --------
 arch/x86/kernel/paravirt.c            | 1 -
 arch/x86/lguest/boot.c                | 2 --
 arch/x86/xen/enlighten.c              | 1 -
 7 files changed, 19 deletions(-)

Comments

Jürgen Groß April 11, 2016, 6:51 a.m. UTC | #1 
On 09/04/16 01:40, Luis R. Rodriguez wrote:
> That that paravirt_enabled() is replaced with proper
> x86 semantics we can remove it.
> 
> Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
> ---
>  arch/x86/include/asm/paravirt.h       | 5 -----
>  arch/x86/include/asm/paravirt_types.h | 1 -
>  arch/x86/include/asm/processor.h      | 1 -
>  arch/x86/kernel/kvm.c                 | 8 --------
>  arch/x86/kernel/paravirt.c            | 1 -
>  arch/x86/lguest/boot.c                | 2 --
>  arch/x86/xen/enlighten.c              | 1 -
>  7 files changed, 19 deletions(-)

Xen parts:

Acked-by: Juergen Gross <jgross@suse.com>


Juergen

> 
> diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
> index 6c7a4a192032..dff26bc91b17 100644
> --- a/arch/x86/include/asm/paravirt.h
> +++ b/arch/x86/include/asm/paravirt.h
> @@ -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)
>  {
> diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
> index 6acc1b26cf40..7fedf24bd811 100644
> --- a/arch/x86/include/asm/paravirt_types.h
> +++ b/arch/x86/include/asm/paravirt_types.h
> @@ -69,7 +69,6 @@ struct pv_info {
>  	u16 extra_user_64bit_cs;  /* __USER_CS if none */
>  #endif
>  
> -	int paravirt_enabled;
>  	const char *name;
>  };
>  
> diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
> index 0c70c7daa6b8..8d326e822cb8 100644
> --- a/arch/x86/include/asm/processor.h
> +++ b/arch/x86/include/asm/processor.h
> @@ -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)
> diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
> index dc1207e2f193..eea2a6f72b31 100644
> --- a/arch/x86/kernel/kvm.c
> +++ b/arch/x86/kernel/kvm.c
> @@ -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;
>  
> diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
> index f08ac28b8136..71a2d8a05a66 100644
> --- a/arch/x86/kernel/paravirt.c
> +++ b/arch/x86/kernel/paravirt.c
> @@ -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 */
>  
> diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
> index f5497ee5fd2f..3847e736702e 100644
> --- a/arch/x86/lguest/boot.c
> +++ b/arch/x86/lguest/boot.c
> @@ -1408,8 +1408,6 @@ __init void lguest_init(void)
>  {
>  	/* We're under lguest. */
>  	pv_info.name = "lguest";
> -	/* Paravirt is enabled. */
> -	pv_info.paravirt_enabled = 1;
>  	/* We're running at privilege level 1, not 0 as normal. */
>  	pv_info.kernel_rpl = 1;
>  	/* Everyone except Xen runs with this set. */
> diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
> index e066fcf87c3d..7c1da39623f4 100644
> --- a/arch/x86/xen/enlighten.c
> +++ b/arch/x86/xen/enlighten.c
> @@ -1186,7 +1186,6 @@ static unsigned xen_patch(u8 type, u16 clobbers, void *insnbuf,
>  }
>  
>  static const struct pv_info xen_info __initconst = {
> -	.paravirt_enabled = 1,
>  	.shared_kernel_pmd = 0,
>  
>  #ifdef CONFIG_X86_64
>
diff mbox

Patch

diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index 6c7a4a192032..dff26bc91b17 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -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)
 {
diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
index 6acc1b26cf40..7fedf24bd811 100644
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
@@ -69,7 +69,6 @@  struct pv_info {
 	u16 extra_user_64bit_cs;  /* __USER_CS if none */
 #endif
 
-	int paravirt_enabled;
 	const char *name;
 };
 
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 0c70c7daa6b8..8d326e822cb8 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -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)
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index dc1207e2f193..eea2a6f72b31 100644
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -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;
 
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
index f08ac28b8136..71a2d8a05a66 100644
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
@@ -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 */
 
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
index f5497ee5fd2f..3847e736702e 100644
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@ -1408,8 +1408,6 @@  __init void lguest_init(void)
 {
 	/* We're under lguest. */
 	pv_info.name = "lguest";
-	/* Paravirt is enabled. */
-	pv_info.paravirt_enabled = 1;
 	/* We're running at privilege level 1, not 0 as normal. */
 	pv_info.kernel_rpl = 1;
 	/* Everyone except Xen runs with this set. */
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index e066fcf87c3d..7c1da39623f4 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1186,7 +1186,6 @@  static unsigned xen_patch(u8 type, u16 clobbers, void *insnbuf,
 }
 
 static const struct pv_info xen_info __initconst = {
-	.paravirt_enabled = 1,
 	.shared_kernel_pmd = 0,
 
 #ifdef CONFIG_X86_64