diff --git a/virtualbox-kernel-3.6.patch b/virtualbox-kernel-3.6.patch new file mode 100644 index 0000000..50ae38d --- /dev/null +++ b/virtualbox-kernel-3.6.patch @@ -0,0 +1,14 @@ +--- a/src/VBox/Additions/linux/drm/vboxvideo_drm.c (revision 42783) ++++ b/src/VBox/Additions/linux/drm/vboxvideo_drm.c (revision 42784) +@@ -106,7 +106,9 @@ + { + /* .driver_features = DRIVER_USE_MTRR, */ + .load = vboxvideo_driver_load, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0) + .reclaim_buffers = drm_core_reclaim_buffers, ++#endif + /* As of Linux 2.6.37, always the internal functions are used. */ + #if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 37) && !defined(DRM_RHEL61) + .get_map_ofs = drm_core_get_map_ofs, +Index: vboxvideo_dac.c +=================================================================== diff --git a/virtualbox.changes b/virtualbox.changes index c4a550e..637d351 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,7 +1,12 @@ +------------------------------------------------------------------- +Thu Sep 27 07:47:14 UTC 2012 - idonmez@suse.com + +- Add virtualbox-kernel-3.6.patch to fix compilation with 3.6 kernel + ------------------------------------------------------------------- Tue Jun 26 14:02:32 UTC 2012 - mvyskocil@suse.cz -- let it build with all versions of openjkd +- let it build with all versions of openjdk ------------------------------------------------------------------- Thu Jun 21 20:01:20 UTC 2012 - mseben@gmail.com diff --git a/virtualbox.spec b/virtualbox.spec index 557957f..b501170 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -130,6 +130,8 @@ Patch101: vbox-default-os-type.diff Patch103: vbox-disable-updates.diff #use pie/fPIE for setuid binaries (bnc#743143) Patch104: vbox-fpie.diff +# Fix compilation with kernel 3.6, upstream r42784 +Patch105: virtualbox-kernel-3.6.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwdutils permissions Requires: %{name}-host-kmp = %version @@ -252,6 +254,7 @@ Development file for %{name} %patch101 %patch103 %patch104 -p1 +%patch105 -p1 #copy user manual %__cp %{S:1} UserManual.pdf #copy kbuild config