projects
/
15.05
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CC: upgrade kernel to 3.18.68
[15.05/openwrt.git]
/
target
/
linux
/
generic
/
patches-3.18
/
204-module_strip.patch
diff --git
a/target/linux/generic/patches-3.18/204-module_strip.patch
b/target/linux/generic/patches-3.18/204-module_strip.patch
index
7c40069
..
1b361d1
100644
(file)
--- a/
target/linux/generic/patches-3.18/204-module_strip.patch
+++ b/
target/linux/generic/patches-3.18/204-module_strip.patch
@@
-32,8
+32,8
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+#if defined(MODULE) && !defined(CONFIG_MODULE_STRIPPED)
/* Creates an alias so file2alias.c can find device table. */
#define MODULE_DEVICE_TABLE(type, name) \
+#if defined(MODULE) && !defined(CONFIG_MODULE_STRIPPED)
/* Creates an alias so file2alias.c can find device table. */
#define MODULE_DEVICE_TABLE(type, name) \
-
extern const struct type##_device_id __mod_##type##__##name##_device_table
\
-@@ -159,7 +160,9 @@
void trim_init_extable(struct module *m)
+
extern const typeof(name) __mod_##type##__##name##_device_table
\
+@@ -159,7 +160,9 @@
extern const typeof(name) __mod_##type##
*/
#if defined(MODULE) || !defined(CONFIG_SYSFS)
*/
#if defined(MODULE) || !defined(CONFIG_SYSFS)
@@
-44,7
+44,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
#else
#define MODULE_VERSION(_version) \
static struct module_version_attribute ___modver_attr = { \
#else
#define MODULE_VERSION(_version) \
static struct module_version_attribute ___modver_attr = { \
-@@ -181,7 +184,7 @@
void trim_init_extable(struct module *m)
+@@ -181,7 +184,7 @@
extern const typeof(name) __mod_##type##
/* Optional firmware file (or files) needed by the module
* format is simply firmware file name. Multiple firmware
* files require multiple MODULE_FIRMWARE() specifiers */
/* Optional firmware file (or files) needed by the module
* format is simply firmware file name. Multiple firmware
* files require multiple MODULE_FIRMWARE() specifiers */
@@
-127,7
+127,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
set_license(mod, get_modinfo(info, "license"));
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
set_license(mod, get_modinfo(info, "license"));
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
-@@ -17
26,7 +1726
,9 @@ static void read_symbols(char *modname)
+@@ -17
58,7 +1758
,9 @@ static void read_symbols(char *modname)
symname = remove_dot(info.strtab + sym->st_name);
handle_modversions(mod, &info, sym, symname);
symname = remove_dot(info.strtab + sym->st_name);
handle_modversions(mod, &info, sym, symname);
@@
-137,7
+137,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
}
if (!is_vmlinux(modname) ||
(is_vmlinux(modname) && vmlinux_section_warnings))
}
if (!is_vmlinux(modname) ||
(is_vmlinux(modname) && vmlinux_section_warnings))
-@@ -1
870,7 +1872
,9 @@ static void add_header(struct buffer *b,
+@@ -1
902,7 +1904
,9 @@ static void add_header(struct buffer *b,
buf_printf(b, "#include <linux/vermagic.h>\n");
buf_printf(b, "#include <linux/compiler.h>\n");
buf_printf(b, "\n");
buf_printf(b, "#include <linux/vermagic.h>\n");
buf_printf(b, "#include <linux/compiler.h>\n");
buf_printf(b, "\n");
@@
-147,7
+147,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
buf_printf(b, "\n");
buf_printf(b, "__visible struct module __this_module\n");
buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
buf_printf(b, "\n");
buf_printf(b, "__visible struct module __this_module\n");
buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
-@@ -1
887,16 +1891
,20 @@ static void add_header(struct buffer *b,
+@@ -1
919,16 +1923
,20 @@ static void add_header(struct buffer *b,
static void add_intree_flag(struct buffer *b, int is_intree)
{
static void add_intree_flag(struct buffer *b, int is_intree)
{
@@
-168,7
+168,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
}
/**
}
/**
-@@ -
1989,11 +1997
,13 @@ static void add_depends(struct buffer *b
+@@ -
2021,11 +2029
,13 @@ static void add_depends(struct buffer *b
static void add_srcversion(struct buffer *b, struct module *mod)
{
static void add_srcversion(struct buffer *b, struct module *mod)
{
@@
-182,7
+182,7
@@
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
}
static void write_if_changed(struct buffer *b, const char *fname)
}
static void write_if_changed(struct buffer *b, const char *fname)
-@@ -22
24,7 +2234
,9 @@ int main(int argc, char **argv)
+@@ -22
56,7 +2266
,9 @@ int main(int argc, char **argv)
add_staging_flag(&buf, mod->name);
err |= add_versions(&buf, mod);
add_depends(&buf, mod, modules);
add_staging_flag(&buf, mod->name);
err |= add_versions(&buf, mod);
add_depends(&buf, mod, modules);