Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit a4b6a77b77ba4f526392612c2365797fab956014

Authored by James Hogan
Committed by Rusty Russell
1 parent b92021b09d
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

module: fix symbol versioning with symbol prefixes 

Fix symbol versioning on architectures with symbol prefixes. Although
the build was free from warnings the actual modules still wouldn't load
as the ____versions table contained unprefixed symbol names, which were
being compared against the prefixed symbol names when checking the
symbol versions.

This is fixed by modifying modpost to add the symbol prefix to the
____versions table it outputs (Modules.symvers still contains unprefixed
symbol names). The check_modstruct_version() function is also fixed as
it checks the version of the unprefixed "module_layout" symbol which
would no longer work.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Michal Marek <mmarek@suse.cz>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jonathan Kliegman <kliegs@chromium.org>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (use VMLINUX_SYMBOL_STR)

Showing 2 changed files with 4 additions and 2 deletions Side-by-side Diff

... ... @@ -1212,7 +1212,8 @@
1212 1212 if (!find_symbol(VMLINUX_SYMBOL_STR(module_layout), NULL,
1213 1213 &crc, true, false))
1214 1214 BUG();
1215   - return check_version(sechdrs, versindex, "module_layout", mod, crc,
  1215 + return check_version(sechdrs, versindex,
  1216 + VMLINUX_SYMBOL_STR(module_layout), mod, crc,
1216 1217 NULL);
1217 1218 }
1218 1219  
scripts/mod/modpost.c
Diff comments   View file @ a4b6a77
... ... @@ -1928,7 +1928,8 @@
1928 1928 s->name, mod->name);
1929 1929 continue;
1930 1930 }
1931   - buf_printf(b, "\t{ %#8x, \"%s\" },\n", s->crc, s->name);
  1931 + buf_printf(b, "\t{ %#8x, VMLINUX_SYMBOL_STR(%s) },\n",
  1932 + s->crc, s->name);
1932 1933 }
1933 1934  
1934 1935 buf_printf(b, "};\n");