kbuild fixes for -rc2
Subsystems (18)
PATCH 1/1 kbuild fixes for -rc2
Hi Linus.
This is a number of kbuild fixes queued up for -rc. The majority of the fixes are related to section mismatch warnings. With these fixes we can now on the callee site control if warnings should be issued or not. There is also a number of patches that just improve the readability of the warnings.
With these patches included we get rid of the most noisy section mismatch warnings and a i386 and x86_64 defconfig build is now section mismatch warning free.
For powerpc one important patch are included to fix MODALIAS handling.
A few patches improve portability of code in scripts/.
In general all low-risk patches.
Patches has been reviewed at lkml and on linux-arch. Please apply.
Sam
The following changes since commit 55b637c6a003a8c4850b41a2c2fd6942d8a7f530:
Linus Torvalds (1):
Linux v2.6.22-rc2
are found in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fix.git
Atsushi Nemoto (1):
kbuild: make better section mismatch reports on i386, arm and mips
Li Yang (1):
kbuild: add "Section mismatch" warning whitelist for powerpc
Mike Frysinger (2):
kbuild: include limits.h in sumversion.c for PATH_MAX
kconfig: search harder for curses library in check-lxdialog.sh
Russell King (1):
kbuild: make modpost section warnings clearer
Sam Ravnborg (6):
all-archs: consolidate .text section definition in asm-generic
all-archs: consolidate .data section definition in asm-generic
kbuild: introduce __init_refok/__initdata_refok to supress section mismatch warnings init/main: use __init_refok to fix section mismatch
mm: fix section mismatch warnings
mm/slab: fix section mismatch warning
Sylvain Munaut (1):
powerpc: Fix the MODALIAS generation in modpost for of devices
arch/alpha/kernel/vmlinux.lds.S | 4 +- arch/arm/kernel/vmlinux.lds.S | 4 +- arch/arm26/kernel/vmlinux-arm26-xip.lds.in | 4 +- arch/arm26/kernel/vmlinux-arm26.lds.in | 4 +- arch/avr32/kernel/vmlinux.lds.c | 4 +- arch/blackfin/kernel/vmlinux.lds.S | 4 +- arch/frv/kernel/vmlinux.lds.S | 6 +- arch/h8300/kernel/vmlinux.lds.S | 4 +- arch/i386/kernel/vmlinux.lds.S | 4 +- arch/ia64/kernel/vmlinux.lds.S | 9 +- arch/m32r/kernel/vmlinux.lds.S | 4 +- arch/m68k/kernel/vmlinux-std.lds | 4 +- arch/m68k/kernel/vmlinux-sun3.lds | 4 +- arch/m68knommu/kernel/vmlinux.lds.S | 4 +- arch/mips/kernel/vmlinux.lds.S | 4 +- arch/parisc/kernel/vmlinux.lds.S | 4 +- arch/powerpc/kernel/vmlinux.lds.S | 5 +- arch/ppc/kernel/vmlinux.lds.S | 4 +- arch/s390/kernel/vmlinux.lds.S | 4 +- arch/sh/kernel/vmlinux.lds.S | 4 +- arch/sh64/kernel/vmlinux.lds.S | 4 +- arch/sparc/kernel/vmlinux.lds.S | 4 +- arch/sparc64/kernel/vmlinux.lds.S | 4 +- arch/um/kernel/dyn.lds.S | 5 +- arch/um/kernel/uml.lds.S | 4 +- arch/v850/kernel/vmlinux.lds.S | 4 +- arch/x86_64/kernel/vmlinux.lds.S | 4 +- arch/xtensa/kernel/vmlinux.lds.S | 6 +- include/asm-generic/vmlinux.lds.h | 12 ++ include/linux/init.h | 13 ++ init/main.c | 2 +- mm/page_alloc.c | 4 +- mm/slab.c | 2 +- mm/sparse.c | 2 +- scripts/kconfig/lxdialog/check-lxdialog.sh | 24 ++--- scripts/mod/file2alias.c | 11 ++- scripts/mod/modpost.c | 169 +++++++++++++++++++--------- scripts/mod/modpost.h | 3 + scripts/mod/sumversion.c | 1 + 39 files changed, 234 insertions(+), 132 deletions(-)
arch/alpha/kernel/vmlinux.lds.S +2 -2
@@ -15,7 +15,7 @@ SECTIONS _text = .; /* Text and read-only data */ .text : { - *(.text) + TEXT_TEXT SCHED_TEXT LOCK_TEXT *(.fixup)
@@ -89,7 +89,7 @@ SECTIONS _data = .; .data : { /* Data */ - *(.data) + DATA_DATA CONSTRUCTORS }
arch/arm/kernel/vmlinux.lds.S +2 -2
@@ -90,7 +90,7 @@ SECTIONS __exception_text_start = .; *(.exception.text) __exception_text_end = .; - *(.text) + TEXT_TEXT SCHED_TEXT LOCK_TEXT #ifdef CONFIG_MMU
@@ -158,7 +158,7 @@ SECTIONS /* * and the usual data section */ - *(.data) + DATA_DATA CONSTRUCTORS _edata = .;
arch/arm26/kernel/vmlinux-arm26-xip.lds.in +2 -2
@@ -64,7 +64,7 @@ SECTIONS .text : { /* Real text segment */ _text = .; /* Text and read-only data */ - *(.text) + TEXT_TEXT SCHED_TEXT LOCK_TEXT /* FIXME - borrowed from arm32 - check*/ *(.fixup)
@@ -111,7 +111,7 @@ SECTIONS /* * and the usual data section */ - *(.data) + DATA_DATA CONSTRUCTORS *(.init.data)
arch/arm26/kernel/vmlinux-arm26.lds.in +2 -2
@@ -65,7 +65,7 @@ SECTIONS .text : { /* Real text segment */ _text = .; /* Text and read-only data */ - *(.text) + TEXT_TEXT SCHED_TEXT LOCK_TEXT *(.fixup)
@@ -106,7 +106,7 @@ SECTIONS /* * and the usual data section */ - *(.data) + DATA_DATA CONSTRUCTORS _edata = .;
arch/avr32/kernel/vmlinux.lds.c +2 -2
@@ -76,7 +76,7 @@ SECTIONS . = 0x100; *(.scall.text) *(.irq.text) - *(.text) +TEXT_TEXT SCHED_TEXTLOCK_TEXT KPROBES_TEXT
@@ -112,7 +112,7 @@ SECTIONS/* And the rest... */ *(.data.rel*) - *(.data) + DATA_DATA CONSTRUCTORS _edata = .;
arch/blackfin/kernel/vmlinux.lds.S +2 -2
@@ -54,7 +54,7 @@ SECTIONS { _text = .; __stext = .; - *(.text) + TEXT_TEXT SCHED_TEXT *(.text.lock) . = ALIGN(16);
@@ -200,7 +200,7 @@ SECTIONS __sdata = .; . = ALIGN(0x2000); *(.data.init_task) - *(.data) + DATA_DATA . = ALIGN(32); *(.data.cacheline_aligned)
arch/frv/kernel/vmlinux.lds.S +4 -2
@@ -101,13 +101,14 @@ SECTIONS _stext = .; .text : { *( - .text.start .text .text.* + .text.start .text.* #ifdef CONFIG_DEBUG_INFO .init.text .exit.text .exitcall.exit #endif ) + TEXT_TEXT SCHED_TEXT LOCK_TEXT *(.fixup)
@@ -135,7 +136,8 @@ SECTIONS _sdata = .; .data : { /* Data */ - *(.data .data.*) + DATA_DATA + *(.data.*) *(.exit.data) CONSTRUCTORS }
arch/h8300/kernel/vmlinux.lds.S +2 -2
@@ -75,7 +75,7 @@ SECTIONS *(.int_redirect) #endif __stext = . ; - *(.text) + TEXT_TEXT SCHED_TEXT LOCK_TEXT __etext = . ;
@@ -103,7 +103,7 @@ SECTIONS . = ALIGN(0x2000) ; *(.data.init_task) . = ALIGN(0x4) ; - *(.data) + DATA_DATA . = ALIGN(0x4) ; *(.data.*)
arch/i386/kernel/vmlinux.lds.S +2 -2
@@ -44,7 +44,7 @@ SECTIONS /* read-only */ .text : AT(ADDR(.text) - LOAD_OFFSET) { - *(.text) + TEXT_TEXT SCHED_TEXT LOCK_TEXT KPROBES_TEXT
@@ -74,7 +74,7 @@ SECTIONS /* writeable */ . = ALIGN(4096); .data : AT(ADDR(.data) - LOAD_OFFSET) { /* Data */ - *(.data) + DATA_DATA CONSTRUCTORS } :data
arch/ia64/kernel/vmlinux.lds.S +7 -2
@@ -44,7 +44,7 @@ SECTIONS .text : AT(ADDR(.text) - LOAD_OFFSET) { IVT_TEXT - *(.text) + TEXT_TEXT SCHED_TEXT LOCK_TEXT KPROBES_TEXT
@@ -214,7 +214,12 @@ SECTIONS data : { } :data .data : AT(ADDR(.data) - LOAD_OFFSET) - { *(.data) *(.data1) *(.gnu.linkonce.d*) CONSTRUCTORS } + { + DATA_DATA + *(.data1) + *(.gnu.linkonce.d*) + CONSTRUCTORS + } . = ALIGN(16); /* gp must be 16-byte aligned for exc. table */ .got : AT(ADDR(.got) - LOAD_OFFSET)
arch/m32r/kernel/vmlinux.lds.S +2 -2
@@ -27,7 +27,7 @@ SECTIONS _text = .; /* Text and read-only data */ .boot : { *(.boot) } = 0 .text : { - *(.text) + TEXT_TEXT SCHED_TEXT LOCK_TEXT *(.fixup)
@@ -50,7 +50,7 @@ SECTIONS .data : { /* Data */ *(.spu) *(.spi) - *(.data) + DATA_DATA CONSTRUCTORS }
arch/m68k/kernel/vmlinux-std.lds +2 -2
@@ -11,7 +11,7 @@ SECTIONS . = 0x1000; _text = .; /* Text and read-only data */ .text : { - *(.text) + TEXT_TEXT SCHED_TEXT LOCK_TEXT *(.fixup)
@@ -28,7 +28,7 @@ SECTIONS _etext = .; /* End of text section */ .data : { /* Data */ - *(.data) + DATA_DATA CONSTRUCTORS }
arch/m68k/kernel/vmlinux-sun3.lds +2 -2
@@ -12,7 +12,7 @@ SECTIONS _text = .; /* Text and read-only data */ .text : { *(.head) - *(.text) + TEXT_TEXT SCHED_TEXT LOCK_TEXT *(.fixup)
@@ -23,7 +23,7 @@ SECTIONS _etext = .; /* End of text section */ .data : { /* Data */ - *(.data) + DATA_DATA CONSTRUCTORS . = ALIGN(16); /* Exception table */ __start___ex_table = .;
arch/m68knommu/kernel/vmlinux.lds.S +2 -2
@@ -62,7 +62,7 @@ SECTIONS { .text : { _text = .; _stext = . ; - *(.text) + TEXT_TEXT SCHED_TEXT *(.text.lock)
@@ -133,7 +133,7 @@ SECTIONS { .data DATA_ADDR : { . = ALIGN(4); _sdata = . ; - *(.data) + DATA_DATA . = ALIGN(8192) ; *(.data.init_task) _edata = . ;
arch/mips/kernel/vmlinux.lds.S +2 -2
@@ -27,7 +27,7 @@ SECTIONS /* read-only */ _text = .; /* Text and read-only data */ .text : { - *(.text) + TEXT_TEXT SCHED_TEXT LOCK_TEXT *(.fixup)
@@ -62,7 +62,7 @@ SECTIONS . = ALIGN(_PAGE_SIZE); *(.data.init_task) - *(.data) + DATA_DATA CONSTRUCTORS }
arch/parisc/kernel/vmlinux.lds.S +2 -2
@@ -51,7 +51,7 @@ SECTIONS _text = .; /* Text and read-only data */ .text ALIGN(16) : { - *(.text) + TEXT_TEXT SCHED_TEXT LOCK_TEXT *(.text.do_softirq)
@@ -91,7 +91,7 @@ SECTIONS . = ALIGN(L1_CACHE_BYTES); .data : { /* Data */ - *(.data) + DATA_DATA CONSTRUCTORS }
arch/powerpc/kernel/vmlinux.lds.S +3 -2
@@ -34,7 +34,8 @@ SECTIONS /* Text and gots */ .text : { _text = .; - *(.text .text.*) + *(.text.*) + TEXT_TEXT SCHED_TEXT LOCK_TEXT KPROBES_TEXT
@@ -167,7 +168,7 @@ SECTIONS #ifdef CONFIG_PPC32 .data : { - *(.data) + DATA_DATA *(.sdata) *(.got.plt) *(.got) }
arch/ppc/kernel/vmlinux.lds.S +2 -2
@@ -32,7 +32,7 @@ SECTIONS .text : { _text = .; - *(.text) + TEXT_TEXT SCHED_TEXT LOCK_TEXT *(.fixup)
@@ -67,7 +67,7 @@ SECTIONS . = ALIGN(4096); .data : { - *(.data) + DATA_DATA *(.data1) *(.sdata) *(.sdata2)
arch/s390/kernel/vmlinux.lds.S +2 -2
@@ -21,7 +21,7 @@ SECTIONS . = 0x00000000; _text = .; /* Text and read-only data */ .text : { - *(.text) + TEXT_TEXT SCHED_TEXT LOCK_TEXT KPROBES_TEXT
@@ -48,7 +48,7 @@ SECTIONS BUG_TABLE .data : { /* Data */ - *(.data) + DATA_DATA CONSTRUCTORS }
arch/sh/kernel/vmlinux.lds.S +2 -2
@@ -22,7 +22,7 @@ SECTIONS *(.empty_zero_page) } = 0 .text : { - *(.text) + TEXT_TEXT SCHED_TEXT LOCK_TEXT *(.fixup)
@@ -41,7 +41,7 @@ SECTIONS BUG_TABLE .data : { /* Data */ - *(.data) + DATA_DATA /* Align the initial ramdisk image (INITRD) on page boundaries. */ . = ALIGN(PAGE_SIZE);
arch/sh64/kernel/vmlinux.lds.S +2 -2
@@ -54,7 +54,7 @@ SECTIONS } = 0 .text : C_PHYS(.text) { - *(.text) + TEXT_TEXT *(.text64) *(.text..SHmedia32) SCHED_TEXT
@@ -78,7 +78,7 @@ SECTIONS _etext = .; /* End of text section */ .data : C_PHYS(.data) { /* Data */ - *(.data) + DATA_DATA CONSTRUCTORS }
arch/sparc/kernel/vmlinux.lds.S +2 -2
@@ -12,7 +12,7 @@ SECTIONS .text 0xf0004000 : { _text = .; - *(.text) + TEXT_TEXT SCHED_TEXT LOCK_TEXT *(.gnu.warning)
@@ -22,7 +22,7 @@ SECTIONS RODATA .data : { - *(.data) + DATA_DATA CONSTRUCTORS } .data1 : { *(.data1) }
arch/sparc64/kernel/vmlinux.lds.S +2 -2
@@ -14,7 +14,7 @@ SECTIONS .text 0x0000000000404000 : { _text = .; - *(.text) + TEXT_TEXT SCHED_TEXT LOCK_TEXT KPROBES_TEXT
@@ -27,7 +27,7 @@ SECTIONS .data : { - *(.data) + DATA_DATA CONSTRUCTORS } .data1 : { *(.data1) }
arch/um/kernel/dyn.lds.S +3 -2
@@ -62,7 +62,7 @@ SECTIONS } =0x90909090 .plt : { *(.plt) } .text : { - *(.text) + TEXT_TEXT SCHED_TEXT LOCK_TEXT *(.fixup)
@@ -99,7 +99,8 @@ SECTIONS *(.data.init_task) . = ALIGN(KERNEL_STACK_SIZE); *(.data.init_irqstack) - *(.data .data.* .gnu.linkonce.d.*) + DATA_DATA + *(.data.* .gnu.linkonce.d.*) SORT(CONSTRUCTORS) } .data1 : { *(.data1) }
arch/um/kernel/uml.lds.S +2 -2
@@ -37,7 +37,7 @@ SECTIONS .text : { - *(.text) + TEXT_TEXT SCHED_TEXT LOCK_TEXT *(.fixup)
@@ -61,7 +61,7 @@ SECTIONS *(.data.init_task) . = ALIGN(KERNEL_STACK_SIZE); *(.data.init_irqstack) - *(.data) + DATA_DATA *(.gnu.linkonce.d*) CONSTRUCTORS }
arch/v850/kernel/vmlinux.lds.S +2 -2
@@ -92,7 +92,7 @@ #define TEXT_CONTENTS \ _text = .; \ __stext = . ; \ - *(.text) \ + TEXT_TEXT \ SCHED_TEXT \ *(.exit.text) /* 2.5 convention */ \ *(.text.exit) /* 2.4 convention */ \
@@ -113,7 +113,7 @@ /* Kernel data segment. */ #define DATA_CONTENTS \ __sdata = . ; \ - *(.data) \ + DATA_DATA \ *(.exit.data) /* 2.5 convention */ \ *(.data.exit) /* 2.4 convention */ \ . = ALIGN (16) ; \
arch/x86_64/kernel/vmlinux.lds.S +2 -2
@@ -31,7 +31,7 @@ SECTIONS *(.bootstrap.text) _stext = .; /* Then the rest */ - *(.text) + TEXT_TEXT SCHED_TEXT LOCK_TEXT KPROBES_TEXT
@@ -55,7 +55,7 @@ SECTIONS . = ALIGN(PAGE_SIZE); /* Align data segment to page size boundary */ /* Data */ .data : AT(ADDR(.data) - LOAD_OFFSET) { - *(.data) + DATA_DATA CONSTRUCTORS } :data
arch/xtensa/kernel/vmlinux.lds.S +4 -2
@@ -84,7 +84,8 @@ SECTIONS { /* The .head.text section must be the first section! */ *(.head.text) - *(.literal .text) + *(.literal) + TEXT_TEXT *(.srom.text) VMLINUX_SYMBOL(__sched_text_start) = .; *(.sched.literal .sched.text)
@@ -144,7 +145,8 @@ SECTIONS _fdata = .; .data : { - *(.data) CONSTRUCTORS + DATA_DATA + CONSTRUCTORS . = ALIGN(XCHAL_ICACHE_LINESIZE); *(.data.cacheline_aligned) }
include/asm-generic/vmlinux.lds.h +12 -0
@@ -9,6 +9,11 @@/* Align . to a 8 byte boundary equals to maximum function alignment. */ #define ALIGN_FUNCTION () . = ALIGN(8) +/* .data section */ +#define DATA_DATA \ + *(.data) \ + *(.data.init.refok) +#define RODATA \ . = ALIGN(4096); \ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
@@ -139,6 +144,13 @@ VMLINUX_SYMBOL(__security_initcall_end) = .; \ } +/* .text section. Map to function alignment to avoid address changes +* during second ld run in second ld pass when generating System.map */ +#define TEXT_TEXT \ + ALIGN_FUNCTION(); \ + *(.text) \ + *(.text.init.refok) +/* sched.text is aling to function alignment to secure we have same * address even at second ld pass when generating System.map */ #define SCHED_TEXT \
include/linux/init.h +13 -0
@@ -45,6 +45,19 @@#define __exitdata __attribute__ ((__section__(".exit.data")))#define __exit_call __attribute_used__ __attribute__ ((__section__ (".exitcall.exit"))) +/* modpost check for section mismatches during the kernel build. +* A section mismatch happens when there are references from a +* code or data section to an init section (both code or data). +* The init sections are (for most archs) discarded by the kernel +* when early init has completed so all such references are potential bugs. +* For exit sections the same issue exists. +* The following markers are used for the cases where the reference to +* the init/exit section (code or data) is valid and will teach modpost +* not to issue a warning. +* The markers follow same syntax rules as __init / __initdata. */ +#define __init_refok noinline __attribute__ ((__section__ (".text.init.refok"))) +#define __initdata_refok __attribute__ ((__section__ (".data.init.refok"))) +#ifdef MODULE #define __exit __attribute__ ((__section__(".exit.text")))#else
init/main.c +1 -1
@@ -423,7 +423,7 @@ static void __init setup_command_line(char *command_line)* gcc-3.4 accidentally inlines this function, so use noinline. */ -static void noinline rest_init(void) +static void noinline __init_refok rest_init(void)__releases (kernel_lock) {int pid;
mm/page_alloc.c +2 -2
@@ -2165,7 +2165,7 @@ void __init setup_per_cpu_pageset(void)#endif -static __meminit noinline +static noinline __init_refokint zone_wait_table_init (struct zone *zone,unsigned long zone_size_pages) {int i;
@@ -2678,7 +2678,7 @@ static void __meminit free_area_init_core(struct pglist_data *pgdat, } } -static void __meminit alloc_node_mem_map (struct pglist_data *pgdat) +static void __init_refok alloc_node_mem_map(struct pglist_data *pgdat) {/* Skip empty nodes */ if (!pgdat->node_spanned_pages)
mm/slab.c +1 -1
@@ -2037,7 +2037,7 @@ static size_t calculate_slab_order(struct kmem_cache *cachep,return left_over; } -static int setup_cpu_cache (struct kmem_cache *cachep) +static int __init_refok setup_cpu_cache(struct kmem_cache *cachep) {if (g_cpucache_up ==FULL )return enable_cpucache (cachep);
mm/sparse.c +1 -1
@@ -44,7 +44,7 @@ EXPORT_SYMBOL(page_to_nid);#endif #ifdef CONFIG_SPARSEMEM_EXTREME -static struct mem_section noinline *sparse_index_alloc(int nid) +static struct mem_section noinline __init_refok *sparse_index_alloc(int nid) {struct mem_section *section =NULL ; unsigned long array_size = SECTIONS_PER_ROOT *
scripts/kconfig/lxdialog/check-lxdialog.sh +9 -15
@@ -4,21 +4,15 @@ # What library to link ldflags() { - $cc -print-file-name=libncursesw.so | grep -q / - if [ $? -eq 0 ]; then - echo '-lncursesw' - exit - fi - $cc -print-file-name=libncurses.so | grep -q / - if [ $? -eq 0 ]; then - echo '-lncurses' - exit - fi - $cc -print-file-name=libcurses.so | grep -q / - if [ $? -eq 0 ]; then - echo '-lcurses' - exit - fi + for ext in so a dylib ; do + for lib in ncursesw ncurses curses ; do + $cc -print-file-name=lib${lib}.${ext} | grep -q / + if [ $? -eq 0 ]; then + echo "-l${lib}" + exit + fi + done + done exit 1 }
scripts/mod/file2alias.c +8 -3
@@ -353,11 +353,16 @@ static int do_pcmcia_entry(const char *filename,static int do_of_entry (const char *filename,struct of_device_id *of,char *alias) { +int len;char *tmp; -sprintf (alias,"of:N%sT%sC%s" , + len =sprintf (alias,"of:N%sT%s" , of->name[0 ] ? of->name :"*" , - of->type[0 ] ? of->type :"*" , - of->compatible[0 ] ? of->compatible :"*" ); + of->type[0 ] ? of->type :"*" ); + +if (of->compatible[0 ]) +sprintf (&alias[len],"%sC%s" , + of->type[0 ] ?"*" :"" , + of->compatible);/* Replace all whitespace with underscores */ for (tmp = alias; tmp && *tmp; tmp++)
scripts/mod/modpost.c +116 -53
257 lines not on this page · raw message
scripts/mod/modpost.h +3 -0
@@ -60,6 +60,9 @@ typedef union#define ELF64_MIPS_R_SYM (i) \ ((__extension__ (_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_sym) +#define ELF64_MIPS_R_TYPE (i) \ + ((__extension__ (_Elf64_Mips_R_Info_union)(i)).r_info_fields.r_type1) +#if KERNEL_ELFDATA !=HOST_ELFDATA static inline void __endian (const void *src,void *dest,unsigned int size)
scripts/mod/sumversion.c +1 -0
@@ -7,6 +7,7 @@#include <ctype.h> #include <errno.h> #include <string.h> +#include <limits.h> #include "modpost.h" /*