diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-14 20:55:54 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-14 20:55:54 +0300 |
| commit | 280664f558c9d973315d48f125eb664cc607d089 (patch) | |
| tree | 681375d73394670824c2bff1936fbbd62d8c3d1a /include/asm-generic | |
| parent | e0654264c4806dc436b291294a0fbf9be7571ab6 (diff) | |
| parent | dadec066d8fa7da227f623f632ea114690fecaf8 (diff) | |
| download | linux-280664f558c9d973315d48f125eb664cc607d089.tar.xz | |
Merge tag 'modules-for-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux
Pull modules updates from Jessica Yu:
- Use a separate table to store symbol types instead of hijacking
fields in struct Elf_Sym
- Trivial code cleanups
* tag 'modules-for-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
module: add stubs for within_module functions
kallsyms: store type information in its own array
vmlinux.lds.h: drop unused __vermagic
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index bbb9e332f2fe..088987e9a3ea 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -332,7 +332,6 @@ __start_rodata = .; \ *(.rodata) *(.rodata.*) \ RO_AFTER_INIT_DATA /* Read only after init */ \ - KEEP(*(__vermagic)) /* Kernel version magic */ \ . = ALIGN(8); \ __start___tracepoints_ptrs = .; \ KEEP(*(__tracepoints_ptrs)) /* Tracepoints: pointer array */ \ |