diff options
| author | Patrick Mooney <pmooney@pfmooney.com> | 2018-07-18 20:14:58 +0000 |
|---|---|---|
| committer | Patrick Mooney <pmooney@pfmooney.com> | 2018-08-21 17:54:16 +0000 |
| commit | befffd577ca6c3a090d7d3c72d267a383c3a3c45 (patch) | |
| tree | 3d1b28dc8970770089d4a47d74f4d028bb59d110 /usr/src/uts/i86pc/Makefile.files | |
| parent | dce88dec0a5dd9849b881d131e2c0f78a5ba4c97 (diff) | |
| download | illumos-joyent-befffd577ca6c3a090d7d3c72d267a383c3a3c45.tar.gz | |
OS-7080 bhyve and KVM should coexist in peace
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: John Levon <john.levon@joyent.com>
Approved by: John Levon <john.levon@joyent.com>
Diffstat (limited to 'usr/src/uts/i86pc/Makefile.files')
| -rw-r--r-- | usr/src/uts/i86pc/Makefile.files | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/uts/i86pc/Makefile.files b/usr/src/uts/i86pc/Makefile.files index 2a94505acb..2f3a525730 100644 --- a/usr/src/uts/i86pc/Makefile.files +++ b/usr/src/uts/i86pc/Makefile.files @@ -64,6 +64,8 @@ CORE_OBJS += \ hardclk.o \ hat_i86.o \ hat_kdi.o \ + hma.o \ + hma_asm.o \ hma_fpu.o \ hment.o \ hold_page.o \ @@ -100,7 +102,6 @@ CORE_OBJS += \ memscrub.o \ mpcore.o \ notes.o \ - pc_hvm.o \ pci_bios.o \ pci_cfgacc.o \ pci_cfgacc_x86.o \ |