Add support for x86_64

The patch is a pull request from the github repository.

3 files changed, 50 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1ff2c7cdcb35..d6f68535d1ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = eq3_char_loop-dkms
 	pkgdesc = eQ-3 IPC loopback char driver
 	pkgver = 2.19.9
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/eq-3/occu
+	arch = x86_64
 	arch = arm
 	arch = armv6h
 	arch = armv7h
@@ -11,11 +12,13 @@ pkgbase = eq3_char_loop-dkms
 	conflicts = eq3_char_loop
 	source = https://github.com/eq-3/occu/raw/2.19.9/KernelDrivers/eq3_char_loop.c
 	source = access_ok_remove_type.patch
+	source = 64bit_support.patch
 	source = Makefile
 	source = Kbuild
 	source = dkms.conf
 	sha256sums = 88093c1c242830f9d336b4e2cae53e38f83432640566470e48042f728216924f
 	sha256sums = 892d8d914f5d436795d6d120cef41b875cceafac2940fc25f79c1efa6903667e
+	sha256sums = f65af98cb61ede07f389c85c62d66032b19c7f8e4c77d7ce1d1fc09770bf6bcc
 	sha256sums = f4d92e560e8501b13d95e9a8f2e2d9c03acdb994c5b2de8d7f9cda5682550085
 	sha256sums = 28c7d141374ea40099f6cef84ad601443e044a8278699269627d531030320756
 	sha256sums = 09fd52fecc4ed818560b1c3a1652dbd8f45badddb114d2c004314e4decf37664
diff --git a/64bit_support.patch b/64bit_support.patch
new file mode 100644
index 000000000000..fb3928dd08fb
--- /dev/null
+++ b/64bit_support.patch
@@ -0,0 +1,41 @@
+From 3e3c08ec6bf074484ab424c8eac103eba064a538 Mon Sep 17 00:00:00 2001
+From: Alexander Reinert <alex@areinert.de>
+Date: Tue, 30 Jan 2018 13:35:38 +0100
+Subject: [PATCH] Added support for 64 bit kernels
+
+---
+ KernelDrivers/eq3_char_loop.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/KernelDrivers/eq3_char_loop.c b/KernelDrivers/eq3_char_loop.c
+index de2d637d..c3a9e66e 100644
+--- a/KernelDrivers/eq3_char_loop.c
++++ b/KernelDrivers/eq3_char_loop.c
+@@ -48,8 +48,8 @@
+ /* Use 'L' as magic number */

+ #define EQ3LOOP_IOC_MAGIC  'L'

+ 

+-#define EQ3LOOP_IOCSCREATESLAVE _IOW(EQ3LOOP_IOC_MAGIC,  1, unsigned long)

+-#define EQ3LOOP_IOCGEVENTS _IOR(EQ3LOOP_IOC_MAGIC,  2, unsigned long)

++#define EQ3LOOP_IOCSCREATESLAVE _IOW(EQ3LOOP_IOC_MAGIC,  1, uint32_t)

++#define EQ3LOOP_IOCGEVENTS _IOR(EQ3LOOP_IOC_MAGIC,  2, uint32_t)

+ 

+ #define EVENT_BIT_SLAVE_OPENED 0

+ #define EVENT_BIT_SLAVE_CLOSED 1

+@@ -353,7 +353,7 @@ static ssize_t eq3loop_write_master(struct eq3loop_channel_data* channel, struct
+ 	{

+ 		ret=-EFAULT;

+ 		count_to_end = CIRC_SPACE( head, channel->master2slave_buf.tail, BUFSIZE);

+-		printk( KERN_ERR EQ3LOOP_DRIVER_NAME ": eq3loop_write_master() %s: not enought space in the buffers. free space = %i, required space = %i", channel->name,count_to_end,count );

++		printk( KERN_ERR EQ3LOOP_DRIVER_NAME ": eq3loop_write_master() %s: not enought space in the buffers. free space = %zu, required space = %zu", channel->name,count_to_end,count );

+ 		goto out;

+ 	}

+ 	/* ok, space is free, write something */

+@@ -908,6 +908,7 @@ static struct file_operations eq3loop_fops = {
+ 	.ioctl      = eq3loop_ioctl,

+ #else

+ 	.unlocked_ioctl = eq3loop_ioctl,

++	.compat_ioctl = eq3loop_ioctl,

+ #endif

+ };

+ 

diff --git a/PKGBUILD b/PKGBUILD
index b92b55e71237..b4e06ef0defb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 _pkgbase=eq3_char_loop
 pkgname=${_pkgbase}-dkms
 pkgver=2.19.9
-pkgrel=2
+pkgrel=3
 pkgdesc="eQ-3 IPC loopback char driver"
-arch=('arm' 'armv6h' 'armv7h')
+arch=('x86_64' 'arm' 'armv6h' 'armv7h')
 url="https://github.com/eq-3/occu"
 license=('GPL')
 depends=('dkms')
@@ -13,11 +13,13 @@ conflicts=("${_pkgbase}")
 
 source=("https://github.com/eq-3/occu/raw/${pkgver}/KernelDrivers/${_pkgbase}.c"
         "access_ok_remove_type.patch"
+        "64bit_support.patch"
         "Makefile"
         "Kbuild"
         "dkms.conf")
 sha256sums=('88093c1c242830f9d336b4e2cae53e38f83432640566470e48042f728216924f'
             '892d8d914f5d436795d6d120cef41b875cceafac2940fc25f79c1efa6903667e'
+            'f65af98cb61ede07f389c85c62d66032b19c7f8e4c77d7ce1d1fc09770bf6bcc'
             'f4d92e560e8501b13d95e9a8f2e2d9c03acdb994c5b2de8d7f9cda5682550085'
             '28c7d141374ea40099f6cef84ad601443e044a8278699269627d531030320756'
             '09fd52fecc4ed818560b1c3a1652dbd8f45badddb114d2c004314e4decf37664')
@@ -28,6 +30,7 @@ prepare() {
     fi
 
     patch --forward --strip=1 --input="${srcdir}/access_ok_remove_type.patch"
+    patch --forward --strip=2 --input="${srcdir}/64bit_support.patch"
 }
  
 package()  {