From: "tip-bot for Luis R. Rodriguez" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: luto@amacapital.net, dvlasenk@redhat.com,
torvalds@linux-foundation.org, mingo@kernel.org,
mcgrof@kernel.org, brgerst@gmail.com, jgross@suse.com,
bp@alien8.de, linux-kernel@vger.kernel.org, hpa@zytor.com,
tglx@linutronix.de, peterz@infradead.org
Subject: [tip:x86/boot] x86/paravirt: Remove paravirt_enabled()
Date: Fri, 22 Apr 2016 02:54:11 -0700 [thread overview]
Message-ID: <tip-867fe800b4c423bce46e66ccb2ce91bebbd5afc6@git.kernel.org> (raw)
In-Reply-To: <1460592286-300-15-git-send-email-mcgrof@kernel.org>
Commit-ID: 867fe800b4c423bce46e66ccb2ce91bebbd5afc6
Gitweb: http://git.kernel.org/tip/867fe800b4c423bce46e66ccb2ce91bebbd5afc6
Author: Luis R. Rodriguez <mcgrof@kernel.org>
AuthorDate: Wed, 13 Apr 2016 17:04:44 -0700
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 22 Apr 2016 10:29:07 +0200
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: Luis R. Rodriguez <mcgrof@kernel.org>
Acked-by: Juergen 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: Ingo Molnar <mingo@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(-)
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index 6c7a4a1..dff26bc 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 6acc1b2..7fedf24 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 0c70c7d..8d326e8 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 8079508..c66546f 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 f08ac28..71a2d8a 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 f5497ee..3847e73 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 752029d..5fc20a1 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1187,7 +1187,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
next prev parent reply other threads:[~2016-04-22 9:56 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-14 0:04 [PATCH v6 00/16] x86: remove paravirt_enabled() Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 01/16] x86/boot: enumerate documentation for the x86 hardware_subarch Luis R. Rodriguez
2016-04-22 9:49 ` [tip:x86/boot] x86/boot: Enumerate " tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 02/16] x86/xen: use X86_SUBARCH_XEN for PV guest boots Luis R. Rodriguez
2016-04-14 0:04 ` Luis R. Rodriguez
2016-04-22 9:49 ` [tip:x86/boot] x86/xen: Use " tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 03/16] tools/lguest: make lguest launcher use X86_SUBARCH_LGUEST explicitly Luis R. Rodriguez
2016-04-22 9:49 ` [tip:x86/boot] tools/lguest: Make " tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 04/16] x86/rtc: replace paravirt rtc check with platform legacy quirk Luis R. Rodriguez
2016-04-14 0:04 ` Luis R. Rodriguez
2016-04-14 4:28 ` Juergen Gross
2016-04-22 9:50 ` [tip:x86/boot] x86/rtc: Replace " tip-bot for Luis R. Rodriguez
2024-04-03 15:34 ` [tip: x86/cleanups] x86/rtc: Remove unused intel-mid.h tip-bot2 for Andy Shevchenko
2016-04-14 0:04 ` [PATCH v6 05/16] x86, ACPI: move ACPI_FADT_NO_CMOS_RTC check to ACPI boot code Luis R. Rodriguez
2016-04-14 0:04 ` Luis R. Rodriguez
2016-04-22 9:50 ` [tip:x86/boot] x86/ACPI: Move " tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 06/16] x86/init: use a platform legacy quirk for ebda Luis R. Rodriguez
2016-04-14 0:04 ` Luis R. Rodriguez
2016-04-22 9:51 ` [tip:x86/boot] x86/init: Use a platform legacy quirk for EBDA tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 07/16] tools/lguest: force disable tboot and apm Luis R. Rodriguez
2016-04-22 9:51 ` [tip:x86/boot] tools/lguest: Force disable tboot and APM tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 08/16] apm32: remove paravirt_enabled() use Luis R. Rodriguez
2016-04-14 0:04 ` Luis R. Rodriguez
2016-04-22 9:51 ` [tip:x86/boot] x86/apm32: Remove " tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 09/16] x86/tboot: remove paravirt_enabled() Luis R. Rodriguez
2016-04-14 0:04 ` Luis R. Rodriguez
2016-04-22 9:52 ` [tip:x86/boot] x86/tboot: Remove paravirt_enabled() use tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 10/16] x86/cpu/intel: remove not needed paravirt_enabled() for f00f work around Luis R. Rodriguez
2016-04-22 9:52 ` [tip:x86/boot] x86/cpu/intel: Remove not needed paravirt_enabled() use for F00F " tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 11/16] pnpbios: replace paravirt_enabled() check with legacy device check Luis R. Rodriguez
2016-04-22 9:53 ` [tip:x86/boot] x86, drivers/pnpbios: Replace " tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 12/16] x86, ACPI: parse ACPI_FADT_LEGACY_DEVICES Luis R. Rodriguez
2016-04-14 0:04 ` Luis R. Rodriguez
2016-04-22 9:53 ` [tip:x86/boot] x86/ACPI: Parse ACPI_FADT_LEGACY_DEVICES tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 13/16] x86/init: rename ebda code file Luis R. Rodriguez
2016-04-14 0:04 ` Luis R. Rodriguez
2016-04-22 9:53 ` [tip:x86/boot] x86/init: Rename EBDA " tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 14/16] x86/paravirt: remove paravirt_enabled() Luis R. Rodriguez
2016-04-22 9:54 ` tip-bot for Luis R. Rodriguez [this message]
2016-04-14 0:04 ` [PATCH v6 15/16] x86/init: disable pnpbios for X86_SUBARCH_INTEL_MID Luis R. Rodriguez
2016-04-14 0:04 ` Luis R. Rodriguez
2016-04-22 9:54 ` [tip:x86/boot] x86/init: Disable " tip-bot for Luis R. Rodriguez
2016-04-14 0:04 ` [PATCH v6 16/16] x86/init: disable pnpbios and rtc for X86_SUBARCH_CE4100 Luis R. Rodriguez
2016-04-22 9:54 ` [tip:x86/boot] x86/init: Disable " tip-bot for Luis R. Rodriguez
2016-04-14 0:13 ` [PATCH v6 05/16] x86, ACPI: move ACPI_FADT_NO_CMOS_RTC check to ACPI boot code Luis R. Rodriguez
2016-04-14 0:13 ` [PATCH v6 07/16] tools/lguest: force disable tboot and apm Luis R. Rodriguez
2016-04-14 0:13 ` [PATCH v6 12/16] x86, ACPI: parse ACPI_FADT_LEGACY_DEVICES Luis R. Rodriguez
2016-04-14 0:17 ` [PATCH v6 05/16] x86, ACPI: move ACPI_FADT_NO_CMOS_RTC check to ACPI boot code Luis R. Rodriguez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-867fe800b4c423bce46e66ccb2ce91bebbd5afc6@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=dvlasenk@redhat.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mcgrof@kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.