mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-22 23:01:56 +00:00
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From bf8ce0d484c8507c562b8c35d5d097c9b75191ce Mon Sep 17 00:00:00 2001
|
|
From: Myy <myy@miouyouyou.fr>
|
|
Date: Wed, 17 May 2017 08:05:41 +0000
|
|
Subject: [PATCH 2/2] Using the new header on 4.12 kernels for copy_*_user
|
|
|
|
These changes are due to :
|
|
- generic ...copy_..._user primitives
|
|
d597580d373774b1bdab84b3d26ff0b55162b916
|
|
Version : 4.12-rc1
|
|
|
|
Signed-off-by: Myy <myy@miouyouyou.fr>
|
|
---
|
|
drivers/base/ump/src/linux/ump_kernel_linux.c | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/base/ump/src/linux/ump_kernel_linux.c b/drivers/base/ump/src/linux/ump_kernel_linux.c
|
|
index d6c3c53..bb3a7f0 100644
|
|
--- a/drivers/base/ump/src/linux/ump_kernel_linux.c
|
|
+++ b/drivers/base/ump/src/linux/ump_kernel_linux.c
|
|
@@ -20,7 +20,12 @@
|
|
#include <linux/ump-ioctl.h>
|
|
#include <linux/ump.h>
|
|
|
|
-#include <asm/uaccess.h> /* copy_*_user */
|
|
+#include <linux/version.h>
|
|
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0)
|
|
+#include <asm/uaccess.h> /* copy_*_user */
|
|
+#else
|
|
+#include <linux/uaccess.h> /* copy_*_user */
|
|
+#endif
|
|
#include <linux/compat.h>
|
|
#include <linux/module.h> /* kernel module definitions */
|
|
#include <linux/fs.h> /* file system operations */
|
|
--
|
|
2.10.2
|
|
|