aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorRoman Yeryomin <roman@advem.lv>2018-01-17 00:07:58 +0200
committerJohn Crispin <john@phrozen.org>2018-02-15 10:46:39 +0100
commitf4e5880d0f3496a3151fe24d87ca2d08d3403a83 (patch)
treeb2a3f276e4786d7eed8d928cd8984975334556cf /target/linux/generic
parenta3b9cbafc33a94606368226020e7b69ff85f1115 (diff)
downloadupstream-f4e5880d0f3496a3151fe24d87ca2d08d3403a83.tar.gz
upstream-f4e5880d0f3496a3151fe24d87ca2d08d3403a83.tar.bz2
upstream-f4e5880d0f3496a3151fe24d87ca2d08d3403a83.zip
ramips: preliminary support for 4.14
- removed upstreamed patches - 0901-spansion_nand_id_fix.patch is disabled, not clear if it's needed Signed-off-by: Roman Yeryomin <roman@advem.lv> Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/backport-4.14/080-v4.15-0001-arch-define-weak-abort.patch7
-rw-r--r--target/linux/generic/backport-4.14/081-v4.15-0002-kernel-exit.c-export-abort-to-modules.patch13
-rw-r--r--target/linux/generic/hack-4.14/204-module_strip.patch12
3 files changed, 8 insertions, 24 deletions
diff --git a/target/linux/generic/backport-4.14/080-v4.15-0001-arch-define-weak-abort.patch b/target/linux/generic/backport-4.14/080-v4.15-0001-arch-define-weak-abort.patch
index 2d247a39e4..1867234540 100644
--- a/target/linux/generic/backport-4.14/080-v4.15-0001-arch-define-weak-abort.patch
+++ b/target/linux/generic/backport-4.14/080-v4.15-0001-arch-define-weak-abort.patch
@@ -30,11 +30,9 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
kernel/exit.c | 8 ++++++++
1 file changed, 8 insertions(+)
-diff --git a/kernel/exit.c b/kernel/exit.c
-index 6b4298a41167..df0c91d5606c 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
-@@ -1755,3 +1755,11 @@ COMPAT_SYSCALL_DEFINE5(waitid,
+@@ -1755,3 +1755,11 @@ Efault:
return -EFAULT;
}
#endif
@@ -46,6 +44,3 @@ index 6b4298a41167..df0c91d5606c 100644
+ /* if that doesn't kill us, halt */
+ panic("Oops failed to kill thread");
+}
---
-2.11.0
-
diff --git a/target/linux/generic/backport-4.14/081-v4.15-0002-kernel-exit.c-export-abort-to-modules.patch b/target/linux/generic/backport-4.14/081-v4.15-0002-kernel-exit.c-export-abort-to-modules.patch
index 5b95b6798d..4c1402f153 100644
--- a/target/linux/generic/backport-4.14/081-v4.15-0002-kernel-exit.c-export-abort-to-modules.patch
+++ b/target/linux/generic/backport-4.14/081-v4.15-0002-kernel-exit.c-export-abort-to-modules.patch
@@ -24,11 +24,9 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
kernel/exit.c | 1 +
4 files changed, 1 insertion(+), 3 deletions(-)
-diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
-index 5cf04888c581..3e26c6f7a191 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
-@@ -793,7 +793,6 @@ void abort(void)
+@@ -790,7 +790,6 @@ void abort(void)
/* if that doesn't kill us, halt */
panic("Oops failed to kill thread");
}
@@ -36,8 +34,6 @@ index 5cf04888c581..3e26c6f7a191 100644
void __init trap_init(void)
{
-diff --git a/arch/m32r/kernel/traps.c b/arch/m32r/kernel/traps.c
-index cb79fba79d43..b88a8dd14933 100644
--- a/arch/m32r/kernel/traps.c
+++ b/arch/m32r/kernel/traps.c
@@ -122,7 +122,6 @@ void abort(void)
@@ -48,8 +44,6 @@ index cb79fba79d43..b88a8dd14933 100644
void __init trap_init(void)
{
-diff --git a/arch/unicore32/kernel/traps.c b/arch/unicore32/kernel/traps.c
-index 5f25b39f04d4..c4ac6043ebb0 100644
--- a/arch/unicore32/kernel/traps.c
+++ b/arch/unicore32/kernel/traps.c
@@ -298,7 +298,6 @@ void abort(void)
@@ -60,8 +54,6 @@ index 5f25b39f04d4..c4ac6043ebb0 100644
void __init trap_init(void)
{
-diff --git a/kernel/exit.c b/kernel/exit.c
-index df0c91d5606c..995453d9fb55 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1763,3 +1763,4 @@ __weak void abort(void)
@@ -69,6 +61,3 @@ index df0c91d5606c..995453d9fb55 100644
panic("Oops failed to kill thread");
}
+EXPORT_SYMBOL(abort);
---
-2.11.0
-
diff --git a/target/linux/generic/hack-4.14/204-module_strip.patch b/target/linux/generic/hack-4.14/204-module_strip.patch
index 2cbcf0f72f..f450d6c070 100644
--- a/target/linux/generic/hack-4.14/204-module_strip.patch
+++ b/target/linux/generic/hack-4.14/204-module_strip.patch
@@ -133,8 +133,8 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}
+#endif
- check_modinfo_retpoline(mod, info);
-
+ check_modinfo_retpoline(mod, info);
+
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1982,7 +1982,9 @@ static void read_symbols(char *modname)
@@ -172,12 +172,12 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static void add_retpoline(struct buffer *b)
{
+#ifndef CONFIG_MODULE_STRIPPED
- buf_printf(b, "\n#ifdef RETPOLINE\n");
- buf_printf(b, "MODULE_INFO(retpoline, \"Y\");\n");
- buf_printf(b, "#endif\n");
+ buf_printf(b, "\n#ifdef RETPOLINE\n");
+ buf_printf(b, "MODULE_INFO(retpoline, \"Y\");\n");
+ buf_printf(b, "#endif\n");
+#endif
}
-
+
static void add_staging_flag(struct buffer *b, const char *name)
{
+#ifndef CONFIG_MODULE_STRIPPED