vboxdrv et al on -current

[Michael Butler]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

With recent header file changes in -current, the virtualbox modules have
ceased to compile :-( Has anyone looked at this yet?

	imb

cd
/usr/ports/emulators/virtualbox-ose-kmod/work/VirtualBox-4.2.16/out/freebsd.x86/release/bin/src
&& make SYSDIR=/usr/src/sys
*** Building 'vboxdrv' module ***
Warning: Object directory not changed from original
/usr/ports/emulators/virtualbox-ose-kmod/work/VirtualBox-4.2.16/out/freebsd.x86/release/bin/src/vboxdrv
@ -> /usr/src/sys
machine -> /usr/src/sys/i386/include
x86 -> /usr/src/sys/x86/include
awk -f @/tools/makeobjops.awk @/kern/device_if.m -h
awk -f @/tools/makeobjops.awk @/kern/bus_if.m -h
cc -O2 -pipe -march=prescott -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0
- -DIN_SUP_R0 -DSUPDRV_WITH_RELEASE_LOGGER -DVBOX -DRT_WITH_VBOX -w
- -DVBOX_WITH_HARDENING -DVBOX_WITH_64_BITS_GUESTS -DRT_ARCH_X86
- -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -nostdinc  -Iinclude
- -I. -Ir0drv -I. -I@ -I@/contrib/altq -finline-limit=8000 --param
inline-unit-growth=100 --param large-function-growth=1000 -fno-common
- -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-sse
- -msoft-float -ffreestanding -fstack-protector -std=iso9899:1999
- -fstack-protector -Wall -Wredundant-decls -Wnested-externs
- -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline
- -Wcast-qual  -Wundef -Wno-pointer-sign -fformat-extensions
- -Wmissing-include-dirs -fdiagnostics-show-option   -c SUPDrv.c
In file included from SUPDrv.c:57:
include/iprt/x86.h:862:1: error: "MSR_IA32_PLATFORM_ID" redefined
In file included from ./machine/specialreg.h:6,
                 from ./machine/atomic.h:37,
                 from @/sys/systm.h:41,
                 from @/sys/libkern.h:39,
                 from include/iprt/string.h:67,
                 from SUPDrvInternal.h:43,
                 from SUPDrv.c:32:
./x86/specialreg.h:344:1: error: this is the location of the previous
definition
In file included from SUPDrv.c:57:
include/iprt/x86.h:869:1: error: "MSR_IA32_FEATURE_CONTROL" redefined
In file included from ./machine/specialreg.h:6,
                 from ./machine/atomic.h:37,
                 from @/sys/systm.h:41,
                 from @/sys/libkern.h:39,
                 from include/iprt/string.h:67,
                 from SUPDrvInternal.h:43,
                 from SUPDrv.c:32:
./x86/specialreg.h:348:1: error: this is the location of the previous
definition
In file included from SUPDrv.c:57:
include/iprt/x86.h:933:1: error: "MSR_IA32_MISC_ENABLE" redefined
In file included from ./machine/specialreg.h:6,
                 from ./machine/atomic.h:37,
                 from @/sys/systm.h:41,
                 from @/sys/libkern.h:39,
                 from include/iprt/string.h:67,
                 from SUPDrvInternal.h:43,
                 from SUPDrv.c:32:
./x86/specialreg.h:377:1: error: this is the location of the previous
definition
*** Error code 1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.14 (FreeBSD)

iEYEARECAAYFAlIkqfIACgkQQv9rrgRC1JKAdQCfS6EiyRU9QOo1obJw8N4S19kj
rNkAoMS0kakgqtYTQNT62gseBTm6QaDE
=sCuP
-----END PGP SIGNATURE-----