vbox_linux-4.3.diff 1.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940
  1. #
  2. # https://forums.virtualbox.org/viewtopic.php?uid=80969&f=7&t=70150&start=0
  3. # kernel 4.3-rc1 heads up
  4. #
  5. --- ./vboxdrv/linux/SUPDrv-linux.c.orig 2015-09-25 20:56:04.704532570 -0700
  6. +++ ./vboxdrv/linux/SUPDrv-linux.c 2015-09-25 20:57:17.265521751 -0700
  7. @@ -485,6 +485,7 @@
  8. * opened, at least we'll blindly assume that here.
  9. */
  10. #ifdef CONFIG_VBOXDRV_AS_MISC
  11. +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
  12. rc = misc_deregister(&gMiscDeviceUsr);
  13. if (rc < 0)
  14. {
  15. @@ -495,6 +496,10 @@
  16. {
  17. Log(("misc_deregister failed with rc=%#x on vboxdrv\n", rc));
  18. }
  19. +#else
  20. + misc_deregister(&gMiscDeviceUsr);
  21. + misc_deregister(&gMiscDeviceSys);
  22. +#endif
  23. #else /* !CONFIG_VBOXDRV_AS_MISC */
  24. # ifdef CONFIG_DEVFS_FS
  25. /*
  26. --- ./vboxnetadp/linux/VBoxNetAdp-linux.c.orig 2015-09-25 20:55:42.309667865 -0700
  27. +++ ./vboxnetadp/linux/VBoxNetAdp-linux.c 2015-09-25 20:58:49.331034237 -0700
  28. @@ -436,7 +436,11 @@
  29. vboxNetAdpShutdown();
  30. /* Remove control device */
  31. + #if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
  32. rc = misc_deregister(&g_CtlDev);
  33. + #else
  34. + misc_deregister(&g_CtlDev);
  35. + #endif
  36. if (rc < 0)
  37. {
  38. printk(KERN_ERR "misc_deregister failed with rc=%x\n", rc);