From: Juergen Gross <jgross@suse.com>
To: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org
Cc: boris.ostrovsky@oracle.com, Juergen Gross <jgross@suse.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org
Subject: [PATCH v2 11/11] x86/cpu: remove hypervisor specific set_cpu_features
Date: Thu, 13 Apr 2017 12:11:16 +0200 [thread overview]
Message-ID: <20170413101116.723-12-jgross@suse.com> (raw)
In-Reply-To: <20170413101116.723-1-jgross@suse.com>
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: Juergen Gross <jgross@suse.com>
---
arch/x86/include/asm/hypervisor.h | 5 -----
arch/x86/kernel/cpu/common.c | 1 -
arch/x86/kernel/cpu/hypervisor.c | 8 --------
3 files changed, 14 deletions(-)
diff --git a/arch/x86/include/asm/hypervisor.h b/arch/x86/include/asm/hypervisor.h
index 6f7545c6e9cf..21126155a739 100644
--- a/arch/x86/include/asm/hypervisor.h
+++ b/arch/x86/include/asm/hypervisor.h
@@ -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 */
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 8ee32119144d..c8b39870f33e 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -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);
diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c
index ce6fcc30f2ad..4fa90006ac68 100644
--- a/arch/x86/kernel/cpu/hypervisor.c
+++ b/arch/x86/kernel/cpu/hypervisor.c
@@ -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();
}
--
2.12.0
next prev parent reply other threads:[~2017-04-13 10:13 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-13 10:11 [PATCH v2 00/11] x86: xen cpuid() cleanup Juergen Gross
2017-04-13 10:11 ` [PATCH v2 01/11] xen: set cpu capabilities from xen_start_kernel() Juergen Gross
2017-04-13 10:11 ` [PATCH v2 02/11] x86/xen: don't indicate DCA support in pv domains Juergen Gross
2017-04-13 10:11 ` [PATCH v2 03/11] x86/xen: use capabilities instead of fake cpuid values for aperf Juergen Gross
2017-04-13 10:11 ` [PATCH v2 04/11] x86/xen: use capabilities instead of fake cpuid values for mtrr Juergen Gross
2017-04-13 10:11 ` [PATCH v2 05/11] x86/xen: use capabilities instead of fake cpuid values for acc Juergen Gross
2017-04-13 10:11 ` [PATCH v2 06/11] x86/xen: use capabilities instead of fake cpuid values for acpi Juergen Gross
2017-04-13 10:11 ` [PATCH v2 07/11] x86/xen: use capabilities instead of fake cpuid values for mwait Juergen Gross
2017-04-13 10:11 ` [PATCH v2 08/11] x86/xen: use capabilities instead of fake cpuid values for x2apic Juergen Gross
2017-04-13 10:11 ` [PATCH v2 09/11] x86/xen: use capabilities instead of fake cpuid values for xsave Juergen Gross
2017-04-13 10:35 ` [Xen-devel] " Andrew Cooper
2017-04-13 10:11 ` [PATCH v2 10/11] vmware: set cpu capabilities during platform initialization Juergen Gross
2017-04-13 10:29 ` Alok Kataria
2017-04-13 10:11 ` Juergen Gross [this message]
2017-04-13 13:39 ` [PATCH v2 00/11] x86: xen cpuid() cleanup Boris Ostrovsky
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=20170413101116.723-12-jgross@suse.com \
--to=jgross@suse.com \
--cc=boris.ostrovsky@oracle.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).