diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-11-17 17:16:05 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-11-17 17:16:05 +0100 |
| commit | 47a0db9b7402ffabe1f3091c5227b97c05784b1c (patch) | |
| tree | c55d0df6f623f49762223dff9f4bcb2eabbae071 /target | |
| parent | aed150f05cebdd90c10e605e7a7f6079b2ef7d1b (diff) | |
default to 4.3, works fine with a patch on gdb h8/300 simulator
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in.kernelversion | 3 | ||||
| -rw-r--r-- | target/linux/patches/4.3/h8300.patch | 29 |
2 files changed, 31 insertions, 1 deletions
diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion index 3e0efd8c2..a1a2ae1b0 100644 --- a/target/config/Config.in.kernelversion +++ b/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 diff --git a/target/linux/patches/4.3/h8300.patch b/target/linux/patches/4.3/h8300.patch new file mode 100644 index 000000000..fc45e6529 --- /dev/null +++ b/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; \ + }) + |