1
0
Pārlūkot izejas kodu

default to 4.3, works fine with a patch on gdb h8/300 simulator

Waldemar Brodkorb 8 gadi atpakaļ
vecāks
revīzija
47a0db9b74

+ 2 - 1
target/config/Config.in.kernelversion

@@ -4,8 +4,8 @@
 choice
 prompt "Kernel Version"
 depends on ADK_TARGET_KERNEL_CUSTOMISING
+default ADK_TARGET_KERNEL_VERSION_4_3_0 if ADK_TARGET_ARCH_H8300
 default ADK_TARGET_KERNEL_VERSION_4_2_6 if ADK_TARGET_ARCH_ARC
-default ADK_TARGET_KERNEL_VERSION_4_2_6 if ADK_TARGET_ARCH_H8300
 default ADK_TARGET_KERNEL_VERSION_4_2_6 if ADK_TARGET_ARCH_SPARC
 default ADK_TARGET_KERNEL_VERSION_3_14_54 if ADK_TARGET_ARCH_BFIN
 default ADK_TARGET_KERNEL_VERSION_4_1_10
@@ -19,6 +19,7 @@ config ADK_TARGET_KERNEL_VERSION_4_3_0
 
 config ADK_TARGET_KERNEL_VERSION_4_2_6
 	bool "4.2.6"
+	depends on !ADK_TARGET_ARCH_H8300
 	select ADK_TARGET_KERNEL_VERSION_4_2
 	
 config ADK_TARGET_KERNEL_VERSION_4_1_10

+ 29 - 0
target/linux/patches/4.3/h8300.patch

@@ -0,0 +1,29 @@
+diff -Nur linux-4.3.orig/include/asm-generic/uaccess.h linux-4.3/include/asm-generic/uaccess.h
+--- linux-4.3.orig/include/asm-generic/uaccess.h	2015-11-02 01:05:25.000000000 +0100
++++ linux-4.3/include/asm-generic/uaccess.h	2015-11-17 13:01:11.745876944 +0100
+@@ -163,9 +163,10 @@
+ 
+ #define put_user(x, ptr)					\
+ ({								\
++	__typeof__((ptr)) __p = (ptr);                          \
+ 	might_fault();						\
+-	access_ok(VERIFY_WRITE, ptr, sizeof(*ptr)) ?		\
+-		__put_user(x, ptr) :				\
++        access_ok(VERIFY_WRITE, __p, sizeof(*__p)) ?            \
++                __put_user((x), __p) :                          \
+ 		-EFAULT;					\
+ })
+ 
+@@ -225,9 +226,10 @@
+ 
+ #define get_user(x, ptr)					\
+ ({								\
++	__typeof__((ptr)) __p = (ptr);				\
+ 	might_fault();						\
+-	access_ok(VERIFY_READ, ptr, sizeof(*ptr)) ?		\
+-		__get_user(x, ptr) :				\
++	access_ok(VERIFY_READ, __p, sizeof(*__p)) ?             \
++		__get_user((x), __p) :                          \
+ 		-EFAULT;					\
+ })
+