[arch-commits] Commit in vhba-module/trunk (2 files)

[Jan Steffens]

    Date: Friday, May 5, 2017 @ 06:53:54
  Author: heftig
Revision: 227087

add patch for 4.11

Added:
  vhba-module/trunk/0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.patch
Modified:
  vhba-module/trunk/PKGBUILD

------------------------------------------------------------+
 0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.patch |   41 +++++++++++
 PKGBUILD                                                   |    3 
 2 files changed, 44 insertions(+)

Added: 0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.patch
===================================================================
--- 0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.patch	                        (rev 0)
+++ 0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.patch	2017-05-05 06:53:54 UTC (rev 227087)
@@ -0,0 +1,41 @@
+From 7dc0d29a3ef6e45455f537c8187791446ca7e1e5 Mon Sep 17 00:00:00 2001
+From: Rok Mandeljc <rok.mandeljc at gmail.com>
+Date: Sun, 26 Mar 2017 17:09:42 +0200
+Subject: [PATCH] VHBA: compatibility fix for upcoming kernel 4.11
+
+As per Bug #104, from 4.11-rc2 on, we need to include linux/sched/signal.h
+instead of linux/sched.h
+---
+ vhba-module/vhba.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/vhba-module/vhba.c b/vhba-module/vhba.c
+index 4a14a10e955000bb..ff30e4cb51b61ec6 100644
+--- a/vhba-module/vhba.c
++++ b/vhba-module/vhba.c
+@@ -18,16 +18,21 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#include <linux/version.h>
++
+ #include <linux/init.h>
+ #include <linux/module.h>
+ #include <linux/highmem.h>
+ #include <linux/fs.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++#include <linux/sched/signal.h>
++#else
+ #include <linux/sched.h>
++#endif
+ #include <linux/platform_device.h>
+ #include <linux/miscdevice.h>
+ #include <linux/poll.h>
+ #include <linux/slab.h>
+-#include <linux/version.h>
+ #ifdef CONFIG_COMPAT
+ #include <linux/compat.h>
+ #endif
+-- 
+2.12.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-05 05:17:50 UTC (rev 227086)
+++ PKGBUILD	2017-05-05 06:53:54 UTC (rev 227087)
@@ -16,12 +16,15 @@
 options=(!makeflags)
 install=$pkgname.install
 source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2"
+        0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.patch
         '60-vhba.rules')
 sha256sums=('cd062d8bd61ccb8137622f837a0dadb771cc935981d8bccb2ad4de0bd11f33d9'
+            'a756b78865bfc1ea7eda447cd209035f9da7982174d03e643af3441d50ab3e08'
             '3052cb1cadbdf4bfb0b588bb8ed80691940d8dd63dc5502943d597eaf9f40c3b')
 
 prepare() {
   cd $pkgname-$pkgver
+  patch -Np2 -i ../0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.patch
 }
 
 build() {