aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10/204-module_strip.patch
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2014-06-26 13:47:46 +0000
committerJohn Crispin <blogic@openwrt.org>2014-06-26 13:47:46 +0000
commita5a86f528d940531f3a24eb3c1b1e66fac492852 (patch)
tree8b2d6f407b83ede3ebd2a3bb4f42970d5e8ea50a /target/linux/generic/patches-3.10/204-module_strip.patch
parent994485877673c5eafe8626e28a805f6ce91cf609 (diff)
downloadmaster-187ad058-a5a86f528d940531f3a24eb3c1b1e66fac492852.tar.gz
master-187ad058-a5a86f528d940531f3a24eb3c1b1e66fac492852.tar.bz2
master-187ad058-a5a86f528d940531f3a24eb3c1b1e66fac492852.zip
kernel: refresh generic patches
Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41352 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10/204-module_strip.patch')
-rw-r--r--target/linux/generic/patches-3.10/204-module_strip.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/patches-3.10/204-module_strip.patch b/target/linux/generic/patches-3.10/204-module_strip.patch
index e4d5407c8e..e130db4289 100644
--- a/target/linux/generic/patches-3.10/204-module_strip.patch
+++ b/target/linux/generic/patches-3.10/204-module_strip.patch
@@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1776,6 +1776,13 @@ config MODULE_SIG_HASH
+@@ -1783,6 +1783,13 @@ config MODULE_SIG_HASH
default "sha384" if MODULE_SIG_SHA384
default "sha512" if MODULE_SIG_SHA512
@@ -133,7 +133,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
-@@ -1740,7 +1740,9 @@ static void read_symbols(char *modname)
+@@ -1744,7 +1744,9 @@ static void read_symbols(char *modname)
symname = info.strtab + sym->st_name;
handle_modversions(mod, &info, sym, symname);
@@ -143,7 +143,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
}
if (!is_vmlinux(modname) ||
(is_vmlinux(modname) && vmlinux_section_warnings))
-@@ -1884,7 +1886,9 @@ static void add_header(struct buffer *b,
+@@ -1888,7 +1890,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");
@@ -153,7 +153,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
buf_printf(b, "\n");
buf_printf(b, "struct module __this_module\n");
buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
-@@ -1901,16 +1905,20 @@ static void add_header(struct buffer *b,
+@@ -1905,16 +1909,20 @@ static void add_header(struct buffer *b,
static void add_intree_flag(struct buffer *b, int is_intree)
{
@@ -174,7 +174,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
}
/**
-@@ -2003,11 +2011,13 @@ static void add_depends(struct buffer *b
+@@ -2007,11 +2015,13 @@ static void add_depends(struct buffer *b
static void add_srcversion(struct buffer *b, struct module *mod)
{
@@ -188,7 +188,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
}
static void write_if_changed(struct buffer *b, const char *fname)
-@@ -2233,7 +2243,9 @@ int main(int argc, char **argv)
+@@ -2237,7 +2247,9 @@ int main(int argc, char **argv)
add_staging_flag(&buf, mod->name);
err |= add_versions(&buf, mod);
add_depends(&buf, mod, modules);