Deleted Added
full compact
tsc.c (271082) tsc.c (273174)
1/*-
2 * Copyright (c) 1998-2003 Poul-Henning Kamp
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1998-2003 Poul-Henning Kamp
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/x86/x86/tsc.c 271082 2014-09-04 02:25:59Z jhb $");
28__FBSDID("$FreeBSD: head/sys/x86/x86/tsc.c 273174 2014-10-16 18:04:43Z davide $");
29
30#include "opt_compat.h"
31#include "opt_clock.h"
32
33#include <sys/param.h>
34#include <sys/bus.h>
35#include <sys/cpu.h>
36#include <sys/limits.h>

--- 113 unchanged lines hidden (view full) ---

150 * VMware "VMwareVMware"
151 * Xen "XenVMMXenVMM"
152 */
153 printf("Hypervisor: Origin = \"%s\"\n", hv_sig);
154 }
155 if (strncmp(hv_sig, "VMwareVMware", 12) != 0)
156 return (0);
157 } else {
29
30#include "opt_compat.h"
31#include "opt_clock.h"
32
33#include <sys/param.h>
34#include <sys/bus.h>
35#include <sys/cpu.h>
36#include <sys/limits.h>

--- 113 unchanged lines hidden (view full) ---

150 * VMware "VMwareVMware"
151 * Xen "XenVMMXenVMM"
152 */
153 printf("Hypervisor: Origin = \"%s\"\n", hv_sig);
154 }
155 if (strncmp(hv_sig, "VMwareVMware", 12) != 0)
156 return (0);
157 } else {
158 p = getenv("smbios.system.serial");
158 p = kern_getenv("smbios.system.serial");
159 if (p == NULL)
160 return (0);
161 if (strncmp(p, "VMware-", 7) != 0 &&
162 strncmp(p, "VMW", 3) != 0) {
163 freeenv(p);
164 return (0);
165 }
166 freeenv(p);

--- 633 unchanged lines hidden ---
159 if (p == NULL)
160 return (0);
161 if (strncmp(p, "VMware-", 7) != 0 &&
162 strncmp(p, "VMW", 3) != 0) {
163 freeenv(p);
164 return (0);
165 }
166 freeenv(p);

--- 633 unchanged lines hidden ---