Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #270 from micmac1/dahdi-linux-uaccess-fixes

Browse source 
dahdi-linux: include linux/uaccess.h rather than asm/uaccess.h
This commit is contained in:
Jiri Slachta 2018-02-18 18:59:59 +01:00 committed by GitHub
commit dd42a681f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 77 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
libs/dahdi-linux/patches/110-fix-uaccess_h-include.patch Normal file
View file

@ -0,0 +1,77 @@
--- a/drivers/dahdi/datamods/syncppp.c
+++ b/drivers/dahdi/datamods/syncppp.c
@@ -39,6 +39,7 @@
#include <linux/config.h>
#include <linux/module.h>
+#include <linux/version.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/init.h>
@@ -56,7 +57,11 @@
#include <net/syncppp.h>
#include <asm/byteorder.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
#include <asm/uaccess.h>
+#else
+#include <linux/uaccess.h>
+#endif
#define MAXALIVECNT 6 /* max. alive packets */
--- a/drivers/dahdi/wcb4xxp/base.c
+++ b/drivers/dahdi/wcb4xxp/base.c
@@ -22,6 +22,7 @@
#include <linux/init.h>
+#include <linux/version.h>
#include <linux/kernel.h> /* printk() */
#include <linux/errno.h> /* error codes */
#include <linux/module.h>
@@ -35,7 +36,11 @@
#include <linux/spinlock.h>
#include <linux/device.h> /* dev_err() */
#include <linux/interrupt.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
#include <asm/uaccess.h> /* copy_*_user */
+#else
+#include <linux/uaccess.h>
+#endif
#include <linux/workqueue.h> /* work_struct */
#include <linux/timer.h> /* timer_struct */
#include <linux/moduleparam.h>
--- a/drivers/dahdi/xpp/mmapdrv.c
+++ b/drivers/dahdi/xpp/mmapdrv.c
@@ -1,3 +1,4 @@
+#include <linux/version.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/delay.h>
@@ -10,7 +11,11 @@
#include <asm/blackfin.h>
#include <asm/dma.h>
#include <asm/cacheflush.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
#include <asm/uaccess.h>
+#else
+#include <linux/uaccess.h>
+#endif
#include <dahdi/kernel.h>
#include "mmapbus.h"
#include "xbus-core.h"
--- a/drivers/dahdi/xpp/xpp_usb.c
+++ b/drivers/dahdi/xpp/xpp_usb.c
@@ -27,7 +27,11 @@
#include <linux/interrupt.h>
#include <linux/delay.h> /* for udelay */
#include <linux/seq_file.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
#include <asm/uaccess.h>
+#else
+#include <linux/uaccess.h>
+#endif
#include <asm/atomic.h>
#include <asm/timex.h>
#include <linux/proc_fs.h>