[XFS] Fix merge failures
[pandora-kernel.git] / arch / x86 / kernel / cpu / hypervisor.c
1 /*
2  * Common hypervisor code
3  *
4  * Copyright (C) 2008, VMware, Inc.
5  * Author : Alok N Kataria <akataria@vmware.com>
6  *
7  * This program is free software; you can redistribute it and/or modify
8  * it under the terms of the GNU General Public License as published by
9  * the Free Software Foundation; either version 2 of the License, or
10  * (at your option) any later version.
11  *
12  * This program is distributed in the hope that it will be useful, but
13  * WITHOUT ANY WARRANTY; without even the implied warranty of
14  * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
15  * NON INFRINGEMENT.  See the GNU General Public License for more
16  * details.
17  *
18  * You should have received a copy of the GNU General Public License
19  * along with this program; if not, write to the Free Software
20  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
21  *
22  */
23
24 #include <asm/processor.h>
25 #include <asm/vmware.h>
26 #include <asm/hypervisor.h>
27
28 static inline void __cpuinit
29 detect_hypervisor_vendor(struct cpuinfo_x86 *c)
30 {
31         if (vmware_platform()) {
32                 c->x86_hyper_vendor = X86_HYPER_VENDOR_VMWARE;
33         } else {
34                 c->x86_hyper_vendor = X86_HYPER_VENDOR_NONE;
35         }
36 }
37
38 unsigned long get_hypervisor_tsc_freq(void)
39 {
40         if (boot_cpu_data.x86_hyper_vendor == X86_HYPER_VENDOR_VMWARE)
41                 return vmware_get_tsc_khz();
42         return 0;
43 }
44
45 static inline void __cpuinit
46 hypervisor_set_feature_bits(struct cpuinfo_x86 *c)
47 {
48         if (boot_cpu_data.x86_hyper_vendor == X86_HYPER_VENDOR_VMWARE) {
49                 vmware_set_feature_bits(c);
50                 return;
51         }
52 }
53
54 void __cpuinit init_hypervisor(struct cpuinfo_x86 *c)
55 {
56         detect_hypervisor_vendor(c);
57         hypervisor_set_feature_bits(c);
58 }