Build failure on HEAD for amd64 in sys/modules/nvmm

[Paul Goyette <paul%whooppee.com@localhost>]

With up-to-date sources, I'm getting

/build/netbsd-compat/tools/x86_64/amd64/bin/x86_64--netbsd-gcc -O2 -g   -std=gnu99    -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wno-sign-compare  -Wsystem-headers   -Wno-traditional   -Wa,--fatal-warnings  -Wreturn-type -Wswitch -Wshadow -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter -Wno-sign-compare -Werror   -ffreestanding  -fno-strict-aliasing -Wno-pointer-sign -mno-red-zone -mno-mmx -mno-sse -mno-avx -msoft-float -mcmodel=kernel -fno-omit-frame-pointer   -I/build/netbsd-compat/src_ro/common/include -DDIAGNOSTIC --sysroot=/build/netbsd-compat/dest/amd64  -I/build/netbsd-compat/src_ro/common/include -DDIAGNOSTIC  -nostdinc -I. -I/build/netbsd-compat/src_ro/sys/modules/nvmm -isystem /build/netbsd-compat/src_ro/sys -isystem /build/netbsd-compat/src_ro/sys/arch -isystem /build/netbsd-compat/src_ro/sys/../common/include -D_KERNEL -D_LKM -D_MODULE -DSYSCTL_INCLUDE_DESCR -c    /build/netbsd-compat/src_ro/sys/dev/nvmm/x86/nvmm_x86_vmx.c
/build/netbsd-compat/src_ro/sys/dev/nvmm/x86/nvmm_x86_vmx.c:193: error: "MSR_IA32_FEATURE_CONTROL" redefined [-Werror]
 #define MSR_IA32_FEATURE_CONTROL 0x003A

In file included from /build/netbsd-compat/src_ro/sys/dev/nvmm/x86/nvmm_x86_vmx.c:48:
./x86/specialreg.h:868: note: this is the location of the previous definition
 #define MSR_IA32_FEATURE_CONTROL 0x03a

cc1: all warnings being treated as errors
*** [nvmm_x86_vmx.o] Error code 1
nbmake[8]: stopped in /build/netbsd-compat/src_ro/sys/modules/nvmm
1 error
nbmake[8]: stopped in /build/netbsd-compat/src_ro/sys/modules/nvmm




+--------------------+--------------------------+-----------------------+
| Paul Goyette       | PGP Key fingerprint:     | E-mail addresses:     |
| (Retired)          | FA29 0E3B 35AF E8AE 6651 | paul%whooppee.com@localhost     |
| Software Developer | 0786 F758 55DE 53BA 7731 | pgoyette%netbsd.org@localhost   |
+--------------------+--------------------------+-----------------------+