2 x kbuild fixes
Subsystems (2)
Hi Linus.
Please pull two kbuild fixes from:
ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-linus.git
Note - new git tree to avoid clash with new stuff. Full diff below the details.
Sam
Geert Uytterhoeven (1):
kbuild: fix reversed symbol name order in modpost
Sam Ravnborg (1):
Add missing init section definitions
include/asm-generic/vmlinux.lds.h | 3 +++ include/linux/init.h | 2 ++ scripts/mod/modpost.c | 2 +- 3 files changed, 6 insertions(+), 1 deletions(-)
include/asm-generic/vmlinux.lds.h +3 -0
@@ -238,6 +238,9 @@ *(.kprobes.text) \ VMLINUX_SYMBOL(__kprobes_text_end) = .; +/* Section used for early init (in .S files) */ +#define HEAD_TEXT *(.head.text) +/* init and exit section handling */ #define INIT_DATA \ *(.init.data) \
include/linux/init.h +2 -0
@@ -42,6 +42,7 @@discard it in modules) */ #define __init __section(.init.text) __cold#define __initdata __section(.init.data) +#define __initconst __section(.init.rodata)#define __exitdata __section(.exit.data)#define __exit_call __used __section(.exitcall.exit)
@@ -106,6 +107,7 @@#define __memexitconst __section(.memexit.rodata)/* For assembly routines */ +#define __HEAD .section ".head.text","ax"#define __INIT .section ".init.text","ax"#define __FINIT .previous
scripts/mod/modpost.c +1 -1
@@ -1200,7 +1200,7 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,"annotate %s with a matching annotation.\n" , from,sec2annotation (fromsec), fromsym, from_p, to,sec2annotation (tosec), tosym, to_p, - fromsym, tosym, fromsym); + tosym, fromsym, tosym);break ;case INIT_TO_EXIT : fprintf(stderr,