diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2015-12-06 03:14:56 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2015-12-06 03:14:56 +0000 |
| commit | 9a242a9927fa42c971c5c48cebb6b709f12ea281 (patch) | |
| tree | 267305f9c3d61566078093df0c83f7e99e851160 /sys | |
| parent | bc01414d1ce7d6abe8e3da684885606dfe1fb25b (diff) | |
unbreak kernel link if vmm isnt being built as part of the kernel.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/amd64/cpu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/amd64/amd64/cpu.c b/sys/arch/amd64/amd64/cpu.c index 406fafbbd83..9c45df415a7 100644 --- a/sys/arch/amd64/amd64/cpu.c +++ b/sys/arch/amd64/amd64/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.92 2015/12/06 01:16:58 mlarkin Exp $ */ +/* $OpenBSD: cpu.c,v 1.93 2015/12/06 03:14:55 dlg Exp $ */ /* $NetBSD: cpu.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $ */ /*- @@ -517,9 +517,11 @@ cpu_init(struct cpu_info *ci) fpu_save_len = ebx; } +#if NVMM > 0 /* Re-enable VMM if needed */ if (ci->ci_flags & CPUF_VMM) start_vmm_on_cpu(ci); +#endif /* NVMM > 0 */ #ifdef MULTIPROCESSOR ci->ci_flags |= CPUF_RUNNING; |