aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-4.14
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/hack-4.14
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/hack-4.14')
-rw-r--r--target/linux/generic/hack-4.14/204-module_strip.patch12
1 files changed, 6 insertions, 6 deletions
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