diff options
| author |   Fabio Erculiani <lxnay@gentoo.org> | 2010-03-11 12:49:22 +0000 |
|---|---|---|
| committer | Fabio Erculiani <lxnay@gentoo.org> | 2010-03-11 12:49:22 +0000 |
| commit | 1899567195052b0e2d66876b9fe74b9c4d6b176e (patch) | |
| tree | 65a3d7fc132fcd278a5eee7601475525cc52b5d3 /x11-drivers/xf86-video-virtualbox/files | |
| parent | Fix building with libpng14. (diff) | |
| download | historical-1899567195052b0e2d66876b9fe74b9c4d6b176e.tar.gz historical-1899567195052b0e2d66876b9fe74b9c4d6b176e.tar.bz2 historical-1899567195052b0e2d66876b9fe74b9c4d6b176e.zip | |
fix vboxvideo kernel panic with 2.6.33, backporting trunk patch
Package-Manager: portage-2.2_rc64/cvs/Linux x86_64
Diffstat (limited to 'x11-drivers/xf86-video-virtualbox/files')
| -rw-r--r-- | x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-3.1.4-2.6.33.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-3.1.4-2.6.33.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-3.1.4-2.6.33.patch new file mode 100644 index 000000000000..c7c0092ec244 --- /dev/null +++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-3.1.4-2.6.33.patch @@ -0,0 +1,16 @@ +--- VirtualBox-3.1.4_OSE.orig/src/VBox/Additions/linux/drm/vboxvideo_drm.c ++++ VirtualBox-3.1.4_OSE/src/VBox/Additions/linux/drm/vboxvideo_drm.c +@@ -87,7 +87,13 @@ static struct drm_driver driver = { + .owner = THIS_MODULE, + .open = drm_open, + .release = drm_release, ++ /* This was changed with Linux 2.6.33 but Fedora backported this ++ * change to their 2.6.32 kernel. */ ++#if defined(DRM_UNLOCKED) || LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 33) ++ .unlocked_ioctl = drm_ioctl, ++#else + .ioctl = drm_ioctl, ++#endif + .mmap = drm_mmap, + .poll = drm_poll, + .fasync = drm_fasync, |