diff options
| author | Juergen Gross <jgross@suse.com> | 2017-04-13 08:55:41 +0200 |
|---|---|---|
| committer | Juergen Gross <jgross@suse.com> | 2017-05-02 11:13:29 +0200 |
| commit | 0808e80cb760de2733c0527d2090ed2205a1eef8 (patch) | |
| tree | d0874b6927dd781fca78419d23d6778aae28676a | |
| parent | 31d47266c6e599d76e84c9809f9ea2735d9cda5b (diff) | |
| download | linux-stable-0808e80cb760de2733c0527d2090ed2205a1eef8.tar.gz linux-stable-0808e80cb760de2733c0527d2090ed2205a1eef8.tar.bz2 linux-stable-0808e80cb760de2733c0527d2090ed2205a1eef8.zip | |
xen: set cpu capabilities from xen_start_kernel()
There is no need to set the same capabilities for each cpu
individually. This can easily be done for all cpus when starting the
kernel.
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
| -rw-r--r-- | arch/x86/xen/enlighten_pv.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index b226f67fb741..6dc922e3848a 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -327,6 +327,12 @@ static void __init xen_init_cpuid_mask(void) cpuid_leaf1_ecx_set_mask = (1 << (X86_FEATURE_MWAIT % 32)); } +static void __init xen_init_capabilities(void) +{ + setup_clear_cpu_cap(X86_BUG_SYSRET_SS_ATTRS); + setup_force_cpu_cap(X86_FEATURE_XENPV); +} + static void xen_set_debugreg(int reg, unsigned long val) { HYPERVISOR_set_debugreg(reg, val); @@ -1318,6 +1324,7 @@ asmlinkage __visible void __init xen_start_kernel(void) xen_init_irq_ops(); xen_init_cpuid_mask(); + xen_init_capabilities(); #ifdef CONFIG_X86_LOCAL_APIC /* @@ -1506,16 +1513,9 @@ static uint32_t __init xen_platform_pv(void) return 0; } -static void xen_set_cpu_features(struct cpuinfo_x86 *c) -{ - clear_cpu_bug(c, X86_BUG_SYSRET_SS_ATTRS); - set_cpu_cap(c, X86_FEATURE_XENPV); -} - const struct hypervisor_x86 x86_hyper_xen_pv = { .name = "Xen PV", .detect = xen_platform_pv, - .set_cpu_features = xen_set_cpu_features, .pin_vcpu = xen_pin_vcpu, }; EXPORT_SYMBOL(x86_hyper_xen_pv); |