git: nvmm: Fix building nvmm into kernel
Aaron LI
aly at crater.dragonflybsd.org
Wed Jul 21 06:26:36 PDT 2021
commit 11755db6b4ad8e01f32f277b591496121e03fc5d
Author: Aaron LI <aly at aaronly.me>
Date: Wed Jul 21 14:53:38 2021 +0800
nvmm: Fix building nvmm into kernel
* Remove 'DIAGNOSTIC' define from 'nvmm_os.h'. First, 'DIAGNOSTIC' and
'INVARIANTS' are different options. Secondly, 'DIAGNOSTIC' should be
defined in kernel configs, e.g., LINT64 defines it.
* Remove 'LOCORE' define from 'nvmm_x86_{svmfunc,vmxfunc}.S'. It's
already defined on the command line, when compiling ASM source files
with the kernel (i.e., building the module into the kernel).
* Manually define 'LOCORE' for 'nvmm_x86_{svmfunc,vmxfunc}.o'
compilation in the Makefile, fixing building as a standalone module.
This fixes building nvmm into kernel, like LINT64.
Thanks swildner for reporting the issue and helping with the fix.
Summary of changes:
sys/dev/virtual/nvmm/Makefile | 3 +++
sys/dev/virtual/nvmm/nvmm_os.h | 1 -
sys/dev/virtual/nvmm/x86/nvmm_x86_svmfunc.S | 1 -
sys/dev/virtual/nvmm/x86/nvmm_x86_vmxfunc.S | 1 -
4 files changed, 3 insertions(+), 3 deletions(-)
http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/11755db6b4ad8e01f32f277b591496121e03fc5d
--
DragonFly BSD source repository
More information about the Commits
mailing list