[VirtualBox-kmod] Add patch for kernel_4.13_rc1

commit 909eae5d2828a3f3936b9fcff6eecc17f2ca3247 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Sun Jul 16 02:47:09 2017 +0100 Add patch for kernel_4.13_rc1 VirtualBox-kmod.spec | 7 ++++++- vbox_fix_for_kernel_4.13_rc0_rf.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) --- diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec index c0ccd8f..fcb49ab 100644 --- a/VirtualBox-kmod.spec +++ b/VirtualBox-kmod.spec @@ -30,7 +30,7 @@ Name: VirtualBox-kmod Version: 5.1.22 #Release: 1%%{?prerel:.%%{prerel}}%%{?dist} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Kernel module for VirtualBox Group: System Environment/Kernel @@ -39,6 +39,7 @@ URL: http://www.virtualbox.org/wiki/VirtualBox # This filters out the XEN kernel, since we don't run on XEN Source1: VirtualBox-kmod-excludekernel-filter.txt patch1: vbox_fix_for_kernel_4.12_rf.patch +patch2: vbox_fix_for_kernel_4.13_rc0_rf.patch %global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time BuildRequires: %{AkmodsBuildRequires} @@ -62,6 +63,7 @@ Kernel module for VirtualBox %setup -T -c tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz %patch1 -p1 +%patch2 -p1 # error out if there was something wrong with kmodtool %{?kmodtool_check} @@ -110,6 +112,9 @@ DIRS=$(ls %{name}-%{version} |wc -l) %changelog +* Wed Jul 12 2017 Sérgio Basto <sergio(a)serjux.com&gt; - 5.1.22-4 +- Add patch for kernel_4.13_rc1 + * Fri Jun 30 2017 Sérgio Basto <sergio(a)serjux.com&gt; - 5.1.22-3 - Add patch for kernel 4.12 diff --git a/vbox_fix_for_kernel_4.13_rc0_rf.patch b/vbox_fix_for_kernel_4.13_rc0_rf.patch new file mode 100644 index 0000000..cf673c8 --- /dev/null +++ b/vbox_fix_for_kernel_4.13_rc0_rf.patch @@ -0,0 +1,26 @@ +diff -rup ./VirtualBox-kmod-5.1.22.orig/vboxdrv/r0drv/linux/waitqueue-r0drv-linux.h ./VirtualBox-kmod-5.1.22/vboxdrv/r0drv/linux/waitqueue-r0drv-linux.h +--- ./VirtualBox-kmod-5.1.22.orig/vboxdrv/r0drv/linux/waitqueue-r0drv-linux.h 2017-04-28 16:04:49.000000000 +0100 ++++ ./VirtualBox-kmod-5.1.22/vboxdrv/r0drv/linux/waitqueue-r0drv-linux.h 2017-07-12 15:49:45.479872750 +0100 +@@ -39,6 +39,9 @@ + * schedule_hrtimeout_range. */ + #define RTR0SEMLNXWAIT_RESOLUTION 50000 + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) ++#define wait_queue_t wait_queue_entry_t ++#endif + + /** + * Kernel mode Linux wait state structure. +diff -rup ./VirtualBox-kmod-5.1.22.orig/vboxguest/r0drv/linux/waitqueue-r0drv-linux.h ./VirtualBox-kmod-5.1.22/vboxguest/r0drv/linux/waitqueue-r0drv-linux.h +--- ./VirtualBox-kmod-5.1.22.orig/vboxguest/r0drv/linux/waitqueue-r0drv-linux.h 2017-04-28 16:04:49.000000000 +0100 ++++ ./VirtualBox-kmod-5.1.22/vboxguest/r0drv/linux/waitqueue-r0drv-linux.h 2017-07-12 15:49:45.479872750 +0100 +@@ -39,6 +39,9 @@ + * schedule_hrtimeout_range. */ + #define RTR0SEMLNXWAIT_RESOLUTION 50000 + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) ++#define wait_queue_t wait_queue_entry_t ++#endif + + /** + * Kernel mode Linux wait state structure.