[vbox-dev] Fixes for upcoming Linux 5.1 kernel

valdis.kletnieks at vt.edu valdis.kletnieks at vt.edu
Tue Jan 29 00:05:45 GMT 2019


A commit landed in linux-next (which will land in 5.1):

commit ae5d11d206fce924efcaa8127ffdbdb60c660d7a
Author: Michael S. Tsirkin <mst at redhat.com>
Date:   Thu Jan 24 08:54:07 2019 -0500

    arch: move common mmap flags to linux/mman.h
    
    Now that we have 3 mmap flags shared by all architectures,
    let's move them into the common header.

This broke the build because MAP_SHARED wasn't defined.

 CC [M]  /usr/share/virtualbox/src/vboxhost/vboxdrv/r0drv/linux/memuserkernel-r0drv-linux.o
/usr/share/virtualbox/src/vboxhost/vboxdrv/r0drv/linux/memobj-r0drv-linux.c: In function ?rtR0MemObjLinuxDoMmap?:
/usr/share/virtualbox/src/vboxhost/vboxdrv/r0drv/linux/memobj-r0drv-linux.c:215:58: error: ?MAP_SHARED? undeclared (first use in this function); did you mean ?VM_SHARED??
  215 |         ulAddr = vm_mmap(NULL, R3PtrFixed, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS | MAP_FIXED, 0);
      |                                                          ^~~~~~~~~~
      |                                                          VM_SHARED
/usr/share/virtualbox/src/vboxhost/vboxdrv/r0drv/linux/memobj-r0drv-linux.c:215:58: note: each undeclared identifier is reported only once for each function it appears in
make[3]: *** [scripts/Makefile.build:277: /usr/share/virtualbox/src/vboxhost/vboxdrv/r0drv/linux/memobj-r0drv-linux.o] Error 1

--- vboxdrv/r0drv/linux/the-linux-kernel.h.dist	2019-01-28 19:01:50.615246073 -0500
+++ vboxdrv/r0drv/linux/the-linux-kernel.h	2019-01-28 19:01:24.495292846 -0500
@@ -128,6 +128,9 @@
 # include <linux/cpu.h>
 # include <linux/notifier.h>
 #endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
+# include <uapi/linux/mman.h>
+#endif
 /* For the basic additions module */
 #include <linux/pci.h>
 #include <linux/delay.h>




More information about the vbox-dev mailing list