148f9bb877
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/x86 uses of the __cpuinit macros from
all C files. x86 only had the one __CPUINIT used in assembly files,
and it wasn't paired off with a .previous or a __FINIT, so we can
delete it directly w/o any corresponding additional change there.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
88 lines
2.2 KiB
C
88 lines
2.2 KiB
C
/*
|
|
* Common hypervisor code
|
|
*
|
|
* Copyright (C) 2008, VMware, Inc.
|
|
* Author : Alok N Kataria <akataria@vmware.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
|
|
* NON INFRINGEMENT. See the GNU General Public License for more
|
|
* details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <asm/processor.h>
|
|
#include <asm/hypervisor.h>
|
|
|
|
/*
|
|
* Hypervisor detect order. This is specified explicitly here because
|
|
* some hypervisors might implement compatibility modes for other
|
|
* hypervisors and therefore need to be detected in specific sequence.
|
|
*/
|
|
static const __initconst struct hypervisor_x86 * const hypervisors[] =
|
|
{
|
|
#ifdef CONFIG_XEN_PVHVM
|
|
&x86_hyper_xen_hvm,
|
|
#endif
|
|
&x86_hyper_vmware,
|
|
&x86_hyper_ms_hyperv,
|
|
#ifdef CONFIG_KVM_GUEST
|
|
&x86_hyper_kvm,
|
|
#endif
|
|
};
|
|
|
|
const struct hypervisor_x86 *x86_hyper;
|
|
EXPORT_SYMBOL(x86_hyper);
|
|
|
|
static inline void __init
|
|
detect_hypervisor_vendor(void)
|
|
{
|
|
const struct hypervisor_x86 *h, * const *p;
|
|
|
|
for (p = hypervisors; p < hypervisors + ARRAY_SIZE(hypervisors); p++) {
|
|
h = *p;
|
|
if (h->detect()) {
|
|
x86_hyper = h;
|
|
printk(KERN_INFO "Hypervisor detected: %s\n", h->name);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
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)
|
|
{
|
|
|
|
detect_hypervisor_vendor();
|
|
|
|
if (!x86_hyper)
|
|
return;
|
|
|
|
init_hypervisor(&boot_cpu_data);
|
|
|
|
if (x86_hyper->init_platform)
|
|
x86_hyper->init_platform();
|
|
}
|
|
|
|
bool __init hypervisor_x2apic_available(void)
|
|
{
|
|
return x86_hyper &&
|
|
x86_hyper->x2apic_available &&
|
|
x86_hyper->x2apic_available();
|
|
}
|