Rename kernel's magic sections for compatibility with -ffunction-sections -fdata-sections
Subsystems (15)
cover Rename kernel's magic sections for compatibility with -ffunction-sections -fdata-sections
Hi Michal, Sam, folks,
Here is a new version of the -ffunction-sections -fdata-sections patch series based on current Linus tree.
The last time a patch series for -ffunction-sections -fdata-sections support was proposed for merge, Linus was concerned that the patch series touched too much rapidly-changing code. So it was decided that we should first clean up the kernel's linker scripts to use macros when referring to these sections, and then have a set of relatively small patches actually renaming the sections in the macros. The linker script cleanup work is now done (the last bits were merged in the v2.6.33 merge window) and so this is the patch series to actually rename the sections. After this patch series is merged, there will be a small set of patches needed to actually enable -ffunction-sections -fdata-sections.
Support for building the kernel with -ffunction-sections -fdata-sections has two applications:
(1) It is the prerequisite needed for section garbage collection (ld --gc-sections), which can shrink the kernel image by up to 10% on embedded kernels.
(2) It is the primary prerequisite change needed for the Ksplice rebootless update system.
The bulk of these patches replace section names like .data.page_aligned to .data..page_aligned.
The problem is that with -ffunction-sections -fdata-sections gcc creates sections like .text.head and .data.nosave whenever someone has innocuous code like this:
static void head(...) {...}
or this:
static int nosave = 1;somewhere in the kernel. Currently, kernel linker scripts are confused by such names and put these sections in wrong places.
With these patches, and without adding -ffunction-sections -fdata-section resulting kernel and modules do not materially change. I checked it by examining ld -Map.
I run-tested these patches on x86-64, alone and with -ffunction-sections -fdata-sections added to KBUILD_CFLAGS. In both cases kernel was booting and working.
When these patches are applied, further plan is to modify linker scripts so that they work correctly with gcc-generated .text.foo sections, and they don't mix up gcc-generated .text.foo sections with special .text..foo sections. Same applies for .data, .rodata, .bss.
avr32 specific question: Haavard, please take a look at patch #16. It renames .text.reset to .text..reset in linker script. However, I don't see where .text.reset section is generated. Is the patch correct?
Please review, and if patches look okay, apply them.
Denys Vlasenko (19):
Rename .bss.stack to .bss..stack.
Rename .data.gate to .data..gate.
Rename .data.init_irqstack to .data..init_irqstack. Rename .data..patch.XXX to .data..patch.XXX. Rename .data[.percpu][.XXX] to .data[..percpu][..XXX]. Rename .data.read_mostly to .data..read_mostly. Rename .data.vmpages and .data.vm0.XXX to .data..vmpages and
.data..vm0.XXX.
Rename .rodata.compressed to .rodata..compressed.
Rename .text.ivt to .text..ivt.
Rename .text.lock to .text..lock.
Rename .text.page_aligned to .text..page_aligned.
Rename .text.reset to .text..reset.
Rename .text.startup to .text..startup.
Rename .data.nosave to .data..nosave.
Rename .data.init to .data..init.
Rename .data.initvect to .data..initvect.
Rename .data.lock_aligned to .data..lock_aligned.
Rename special text sections in arch/frv from .text.XXX to
.text..XXX.Rename .text.start to .text..start.
Tim Abbott (5):
Rename .data.cacheline_aligned to .data..cacheline_aligned. Rename .data.init_task to .data..init_task.
powerpc: remove unused __page_aligned definition. Rename .data.page_aligned to .data..page_aligned. Rename .bss.page_aligned to .bss..page_aligned.
Documentation/mutex-design.txt | 4 +- arch/avr32/kernel/vmlinux.lds.S | 2 +- arch/frv/kernel/break.S | 4 +- arch/frv/kernel/entry.S | 2 +- arch/frv/kernel/head.S | 2 +- arch/frv/kernel/vmlinux.lds.S | 10 ++++---- arch/frv/mm/tlb-miss.S | 2 +- arch/h8300/boot/compressed/head.S | 2 +- arch/h8300/boot/compressed/vmlinux.lds | 2 +- arch/ia64/include/asm/asmmacro.h | 12 ++++---- arch/ia64/include/asm/cache.h | 2 +- arch/ia64/include/asm/percpu.h | 2 +- arch/ia64/kernel/Makefile.gate | 2 +- arch/ia64/kernel/gate-data.S | 2 +- arch/ia64/kernel/gate.S | 8 +++--- arch/ia64/kernel/gate.lds.S | 10 ++++---- arch/ia64/kernel/init_task.c | 2 +- arch/ia64/kernel/ivt.S | 2 +- arch/ia64/kernel/minstate.h | 4 +- arch/ia64/kernel/paravirtentry.S | 2 +- arch/ia64/kernel/vmlinux.lds.S | 28 +++++++++++----------- arch/ia64/kvm/vmm_ivt.S | 2 +- arch/ia64/xen/gate-data.S | 2 +- arch/ia64/xen/xensetup.S | 2 +- arch/m68knommu/kernel/vmlinux.lds.S | 4 +- arch/m68knommu/platform/68360/head-ram.S | 2 +- arch/m68knommu/platform/68360/head-rom.S | 2 +- arch/mips/lasat/image/head.S | 2 +- arch/mips/lasat/image/romscript.normal | 2 +- arch/parisc/include/asm/cache.h | 2 +- arch/parisc/include/asm/system.h | 2 +- arch/parisc/kernel/head.S | 2 +- arch/parisc/kernel/init_task.c | 6 ++-- arch/parisc/kernel/vmlinux.lds.S | 12 ++++---- arch/powerpc/include/asm/cache.h | 2 +- arch/powerpc/include/asm/page_64.h | 8 ------ arch/powerpc/kernel/vmlinux.lds.S | 10 +++---- arch/s390/include/asm/cache.h | 2 +- arch/s390/kernel/swsusp_asm64.S | 2 +- arch/sh/boot/compressed/vmlinux.scr | 2 +- arch/sh/include/asm/cache.h | 2 +- arch/sparc/boot/btfixupprep.c | 2 +- arch/sparc/include/asm/cache.h | 2 +- arch/um/kernel/dyn.lds.S | 2 +- arch/um/kernel/init_task.c | 2 +- arch/um/kernel/uml.lds.S | 2 +- arch/x86/boot/compressed/mkpiggy.c | 2 +- arch/x86/boot/compressed/vmlinux.lds.S | 4 +- arch/x86/include/asm/cache.h | 2 +- arch/x86/kernel/acpi/wakeup_32.S | 2 +- arch/x86/kernel/init_task.c | 2 +- arch/x86/kernel/setup_percpu.c | 2 +- arch/x86/kernel/vmlinux.lds.S | 4 +- include/asm-generic/percpu.h | 10 ++++---- include/asm-generic/vmlinux.lds.h | 38 +++++++++++++++--------------- include/linux/cache.h | 2 +- include/linux/init.h | 2 +- include/linux/init_task.h | 2 +- include/linux/linkage.h | 8 +++--- include/linux/percpu-defs.h | 4 +- include/linux/spinlock.h | 2 +- kernel/module.c | 2 +- 62 files changed, 132 insertions(+), 142 deletions(-)
PATCH 1/24 Rename .data.cacheline_aligned to .data..cacheline_aligned.
From: Tim Abbott <[email protected]>
--- arch/powerpc/kernel/vmlinux.lds.S | 2 +- arch/x86/kernel/init_task.c | 2 +- include/asm-generic/vmlinux.lds.h | 2 +- include/linux/cache.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/kernel/vmlinux.lds.S +1 -1
@@ -231,7 +231,7 @@ SECTIONS PAGE_ALIGNED_DATA(PAGE_SIZE) } - .data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) { + .data..cacheline_aligned : AT(ADDR(.data..cacheline_aligned) - LOAD_OFFSET) { CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES) }
arch/x86/kernel/init_task.c +1 -1
@@ -34,7 +34,7 @@ EXPORT_SYMBOL(init_task);/* * per-CPU TSS segments. Threads are completely 'soft' on Linux, * no more per-task TSS's. The TSS size is kept cacheline-aligned -* so they are allowed to end up in the .data.cacheline_aligned +* so they are allowed to end up in the .data..cacheline_aligned * section. Since TSS's are completely CPU-local, we want them * on exact cacheline boundaries, to eliminate cacheline ping-pong. */
include/asm-generic/vmlinux.lds.h +1 -1
@@ -189,7 +189,7 @@#define CACHELINE_ALIGNED_DATA (align) \ . = ALIGN(align); \ - *(.data.cacheline_aligned) + *(.data..cacheline_aligned)#define INIT_TASK_DATA (align) \ . = ALIGN(align); \
include/linux/cache.h +1 -1
@@ -31,7 +31,7 @@#ifndef __cacheline_aligned#define __cacheline_aligned \ __attribute__((__aligned__(SMP_CACHE_BYTES), \ - __section__(".data.cacheline_aligned"))) + __section__(".data..cacheline_aligned")))#endif /* __cacheline_aligned */ #ifndef __cacheline_aligned_in_smp
Signature · 1 line
1.6.2.4
PATCH 2/24 Rename .data.init_task to .data..init_task.
In reply to Denys VlasenkoFrom: Tim Abbott <[email protected]>
--- arch/ia64/kernel/init_task.c | 2 +- arch/powerpc/kernel/vmlinux.lds.S | 4 +--- include/asm-generic/vmlinux.lds.h | 4 ++-- include/linux/init_task.h | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-)
arch/ia64/kernel/init_task.c +1 -1
@@ -23,7 +23,7 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);* Initial task structure. * * We need to make sure that this is properly aligned due to the way process stacks are -* handled. This is done by having a special ".data.init_task" section... +* handled. This is done by having a special ".data..init_task" section... */ #define init_thread_info init_task_mem.s.thread_info
arch/powerpc/kernel/vmlinux.lds.S +1 -3
@@ -223,9 +223,7 @@ SECTIONS #endif /* The initial task and kernel stack */ - .data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) { - INIT_TASK_DATA(THREAD_SIZE) - } + INIT_TASK_DATA_SECTION(THREAD_SIZE) .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) { PAGE_ALIGNED_DATA(PAGE_SIZE)
include/asm-generic/vmlinux.lds.h +2 -2
@@ -193,7 +193,7 @@#define INIT_TASK_DATA (align) \ . = ALIGN(align); \ - *(.data.init_task) + *(.data..init_task)/* * Read only Data
@@ -435,7 +435,7 @@*/ #define INIT_TASK_DATA_SECTION (align) \ . = ALIGN(align); \ - .data.init_task : { \ + .data..init_task : { \ INIT_TASK_DATA(align) \ }
include/linux/init_task.h +1 -1
@@ -191,7 +191,7 @@ extern struct cred init_cred; }/* Attach to the init_task data structure for proper alignment */ -#define __init_task_data __attribute__((__section__(".data.init_task"))) +#define __init_task_data __attribute__((__section__(".data..init_task")))#endif
Signature · 1 line
1.6.2.4
PATCH 3/24 powerpc: remove unused __page_aligned definition.
In reply to Denys VlasenkoFrom: Tim Abbott <[email protected]>
There is already an architecture-independent __page_aligned_data macro for this purpose, so removing the powerpc-specific macro should be harmless.
--- arch/powerpc/include/asm/page_64.h | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-)
arch/powerpc/include/asm/page_64.h +0 -8
@@ -162,14 +162,6 @@ do { \#endif /* !CONFIG_HUGETLB_PAGE */ -#ifdef MODULE -#define __page_aligned __attribute__((__aligned__(PAGE_SIZE))) -#else -#define __page_aligned \ - __attribute__((__aligned__(PAGE_SIZE), \ - __section__(".data.page_aligned"))) -#endif -#define VM_DATA_DEFAULT_FLAGS \ (test_thread_flag(TIF_32BIT) ? \ VM_DATA_DEFAULT_FLAGS32 : VM_DATA_DEFAULT_FLAGS64)
Signature · 1 line
1.6.2.4
PATCH 4/24 Rename .data.page_aligned to .data..page_aligned.
In reply to Denys VlasenkoFrom: Tim Abbott <[email protected]>
--- arch/ia64/kernel/vmlinux.lds.S | 2 +- arch/powerpc/kernel/vmlinux.lds.S | 2 +- include/asm-generic/vmlinux.lds.h | 2 +- include/linux/linkage.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-)
arch/ia64/kernel/vmlinux.lds.S +1 -1
@@ -175,7 +175,7 @@ SECTIONS . = ALIGN(PAGE_SIZE); __init_end = .; - .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) + .data..page_aligned : AT(ADDR(.data..page_aligned) - LOAD_OFFSET) { PAGE_ALIGNED_DATA(PAGE_SIZE) . = ALIGN(PAGE_SIZE);
arch/powerpc/kernel/vmlinux.lds.S +1 -1
@@ -225,7 +225,7 @@ SECTIONS /* The initial task and kernel stack */ INIT_TASK_DATA_SECTION(THREAD_SIZE) - .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) { + .data..page_aligned : AT(ADDR(.data..page_aligned) - LOAD_OFFSET) { PAGE_ALIGNED_DATA(PAGE_SIZE) }
include/asm-generic/vmlinux.lds.h +1 -1
@@ -181,7 +181,7 @@#define PAGE_ALIGNED_DATA (page_align) \ . = ALIGN(page_align); \ - *(.data.page_aligned) + *(.data..page_aligned)#define READ_MOSTLY_DATA (align) \ . = ALIGN(align); \
include/linux/linkage.h +2 -2
@@ -18,7 +18,7 @@# define asmregparm#endif -#define __page_aligned_data __section(.data.page_aligned) __aligned(PAGE_SIZE) +#define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)#define __page_aligned_bss __section(.bss.page_aligned) __aligned(PAGE_SIZE)/*
@@ -27,7 +27,7 @@* Note when using these that you must specify the appropriate * alignment directives yourself */ -#define __PAGE_ALIGNED_DATA .section ".data.page_aligned", "aw" +#define __PAGE_ALIGNED_DATA .section ".data..page_aligned", "aw"#define __PAGE_ALIGNED_BSS .section ".bss.page_aligned", "aw"/*
Signature · 1 line
1.6.2.4
PATCH 5/24 Rename .bss.page_aligned to .bss..page_aligned.
In reply to Denys VlasenkoFrom: Tim Abbott <[email protected]>
--- arch/x86/kernel/vmlinux.lds.S | 2 +- include/asm-generic/vmlinux.lds.h | 2 +- include/linux/linkage.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/kernel/vmlinux.lds.S +1 -1
@@ -305,7 +305,7 @@ SECTIONS . = ALIGN(PAGE_SIZE); .bss : AT(ADDR(.bss) - LOAD_OFFSET) { __bss_start = .; - *(.bss.page_aligned) + *(.bss..page_aligned) *(.bss) . = ALIGN(4); __bss_stop = .;
include/asm-generic/vmlinux.lds.h +1 -1
@@ -499,7 +499,7 @@#define BSS (bss_align) \ . = ALIGN(bss_align); \ .bss : AT(ADDR(.bss) - LOAD_OFFSET) { \ - *(.bss.page_aligned) \ + *(.bss..page_aligned) \ *(.dynbss) \ *(.bss) \ *(COMMON) \
include/linux/linkage.h +2 -2
@@ -19,7 +19,7 @@#endif #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE) -#define __page_aligned_bss __section(.bss.page_aligned) __aligned(PAGE_SIZE) +#define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)/* * For assembly routines.
@@ -28,7 +28,7 @@* alignment directives yourself */ #define __PAGE_ALIGNED_DATA .section ".data..page_aligned", "aw" -#define __PAGE_ALIGNED_BSS .section ".bss.page_aligned", "aw" +#define __PAGE_ALIGNED_BSS .section ".bss..page_aligned", "aw"/* * This is used by architectures to keep arguments on the stack
Signature · 1 line
1.6.2.4
PATCH 6/24 Rename .bss.stack to .bss..stack.
In reply to Denys Vlasenko--- arch/frv/kernel/break.S | 2 +- arch/frv/kernel/vmlinux.lds.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/frv/kernel/break.S +1 -1
@@ -21,7 +21,7 @@ # # the break handler has its own stack # - .section .bss.stack + .section .bss..stack .globl __break_user_context .balign THREAD_SIZE __break_stack:
arch/frv/kernel/vmlinux.lds.S +1 -1
@@ -114,7 +114,7 @@ SECTIONS .sbss : { *(.sbss .sbss.*) } .bss : { *(.bss .bss.*) } - .bss.stack : { *(.bss) } + .bss..stack : { *(.bss) } __bss_stop = .; _end = . ;
Signature · 1 line
1.6.2.4
PATCH 7/24 Rename .data.gate to .data..gate.
In reply to Denys Vlasenko--- arch/ia64/kernel/Makefile.gate | 2 +- arch/ia64/kernel/gate-data.S | 2 +- arch/ia64/kernel/vmlinux.lds.S | 4 ++-- arch/ia64/xen/gate-data.S | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
arch/ia64/kernel/Makefile.gate +1 -1
@@ -21,7 +21,7 @@ GATECFLAGS_gate-syms.o = -r $(obj)/gate-syms.o: $(obj)/gate.lds $(obj)/gate.o FORCE $(call if_changed,gate) -# gate-data.o contains the gate DSO image as data in section .data.gate. +# gate-data.o contains the gate DSO image as data in section .data..gate. # We must build gate.so before we can assemble it. # Note: kbuild does not track this dependency due to usage of .incbin $(obj)/gate-data.o: $(obj)/gate.so
arch/ia64/kernel/gate-data.S +1 -1
@@ -1,3 +1,3 @@ - .section .data.gate, "aw" + .section .data..gate, "aw" .incbin "arch/ia64/kernel/gate.so"
arch/ia64/kernel/vmlinux.lds.S +2 -2
@@ -180,12 +180,12 @@ SECTIONS PAGE_ALIGNED_DATA(PAGE_SIZE) . = ALIGN(PAGE_SIZE); __start_gate_section = .; - *(.data.gate) + *(.data..gate) __stop_gate_section = .; #ifdef CONFIG_XEN . = ALIGN(PAGE_SIZE); __xen_start_gate_section = .; - *(.data.gate.xen) + *(.data..gate.xen) __xen_stop_gate_section = .; #endif }
arch/ia64/xen/gate-data.S +1 -1
@@ -1,3 +1,3 @@ - .section .data.gate.xen, "aw" + .section .data..gate.xen, "aw" .incbin "arch/ia64/xen/gate.so"
Signature · 1 line
1.6.2.4
PATCH 8/24 Rename .data.init_irqstack to .data..init_irqstack.
In reply to Denys Vlasenko--- arch/um/kernel/dyn.lds.S | 2 +- arch/um/kernel/init_task.c | 2 +- arch/um/kernel/uml.lds.S | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/um/kernel/dyn.lds.S +1 -1
@@ -94,7 +94,7 @@ SECTIONS .data : { INIT_TASK_DATA(KERNEL_STACK_SIZE) . = ALIGN(KERNEL_STACK_SIZE); - *(.data.init_irqstack) + *(.data..init_irqstack) DATA_DATA *(.data.* .gnu.linkonce.d.*) SORT(CONSTRUCTORS)
arch/um/kernel/init_task.c +1 -1
@@ -34,5 +34,5 @@ union thread_union init_thread_union __init_task_data = { INIT_THREAD_INFO(init_task) }; union thread_union cpu0_irqstack - __attribute__((__section__(".data.init_irqstack"))) = + __attribute__((__section__(".data..init_irqstack"))) = { INIT_THREAD_INFO(init_task) };
arch/um/kernel/uml.lds.S +1 -1
@@ -50,7 +50,7 @@ SECTIONS { INIT_TASK_DATA(KERNEL_STACK_SIZE) . = ALIGN(KERNEL_STACK_SIZE); - *(.data.init_irqstack) + *(.data..init_irqstack) DATA_DATA *(.gnu.linkonce.d*) CONSTRUCTORS
Signature · 1 line
1.6.2.4
PATCH 9/24 Rename .data..patch.xxx to .data..patch.xxx.
In reply to Denys Vlasenko--- arch/ia64/include/asm/asmmacro.h | 12 ++++++------ arch/ia64/kernel/gate.S | 8 ++++---- arch/ia64/kernel/gate.lds.S | 10 +++++----- arch/ia64/kernel/minstate.h | 4 ++-- arch/ia64/kernel/vmlinux.lds.S | 16 ++++++++-------- 5 files changed, 25 insertions(+), 25 deletions(-)
arch/ia64/include/asm/asmmacro.h +6 -6
@@ -70,12 +70,12 @@ name:* path (ivt.S - TLB miss processing) or in places where it might not be * safe to use a "tpa" instruction (mca_asm.S - error recovery). */ - .section ".data.patch.vtop", "a" // declare section & section attributes + .section ".data..patch.vtop", "a" // declare section & section attributes .previous#define LOAD_PHYSICAL (pr, reg, obj) \ [1:](pr)movl reg = obj; \ - .xdata4 ".data.patch.vtop", 1b-. + .xdata4 ".data..patch.vtop", 1b-./* * For now, we always put in the McKinley E9 workaround. On CPUs that don't need it,
@@ -84,11 +84,11 @@ name:#define DO_MCKINLEY_E9_WORKAROUND #ifdef DO_MCKINLEY_E9_WORKAROUND - .section ".data.patch.mckinley_e9", "a" + .section ".data..patch.mckinley_e9", "a" .previous/* workaround for Itanium 2 Errata 9: */ # define FSYS_RETURN \ - .xdata4 ".data.patch.mckinley_e9", 1f-.; \ + .xdata4 ".data..patch.mckinley_e9", 1f-.; \ 1:{ .mib; \ nop.m 0; \ mov r16=ar.pfs; \
@@ -107,11 +107,11 @@ name:* If physical stack register size is different from DEF_NUM_STACK_REG, * dynamically patch the kernel for correct size. */ - .section ".data.patch.phys_stack_reg", "a" + .section ".data..patch.phys_stack_reg", "a" .previous#define LOAD_PHYS_STACK_REG_SIZE (reg) \ [1:] adds reg=IA64_NUM_PHYS_STACK_REG*8+8,r0; \ - .xdata4 ".data.patch.phys_stack_reg", 1b-. + .xdata4 ".data..patch.phys_stack_reg", 1b-./* * Up until early 2004, use of .align within a function caused bad unwind info.
arch/ia64/kernel/gate.S +4 -4
@@ -21,18 +21,18 @@ * to targets outside the shared object) and to avoid multi-phase kernel builds, we * simply create minimalistic "patch lists" in special ELF sections. */ - .section ".data.patch.fsyscall_table", "a" + .section ".data..patch.fsyscall_table", "a" .previous #define LOAD_FSYSCALL_TABLE(reg) \ [1:] movl reg=0; \ - .xdata4 ".data.patch.fsyscall_table", 1b-. + .xdata4 ".data..patch.fsyscall_table", 1b-. - .section ".data.patch.brl_fsys_bubble_down", "a" + .section ".data..patch.brl_fsys_bubble_down", "a" .previous #define BRL_COND_FSYS_BUBBLE_DOWN(pr) \ [1:](pr)brl.cond.sptk 0; \ ;; \ - .xdata4 ".data.patch.brl_fsys_bubble_down", 1b-. + .xdata4 ".data..patch.brl_fsys_bubble_down", 1b-. GLOBAL_ENTRY(__kernel_syscall_via_break) .prologue
arch/ia64/kernel/gate.lds.S +5 -5
@@ -33,21 +33,21 @@ SECTIONS */ . = GATE_ADDR + 0x600; - .data.patch : { + .data..patch : { __paravirt_start_gate_mckinley_e9_patchlist = .; - *(.data.patch.mckinley_e9) + *(.data..patch.mckinley_e9) __paravirt_end_gate_mckinley_e9_patchlist = .; __paravirt_start_gate_vtop_patchlist = .; - *(.data.patch.vtop) + *(.data..patch.vtop) __paravirt_end_gate_vtop_patchlist = .; __paravirt_start_gate_fsyscall_patchlist = .; - *(.data.patch.fsyscall_table) + *(.data..patch.fsyscall_table) __paravirt_end_gate_fsyscall_patchlist = .; __paravirt_start_gate_brl_fsys_bubble_down_patchlist = .; - *(.data.patch.brl_fsys_bubble_down) + *(.data..patch.brl_fsys_bubble_down) __paravirt_end_gate_brl_fsys_bubble_down_patchlist = .; } :readable
arch/ia64/kernel/minstate.h +2 -2
@@ -16,7 +16,7 @@#define ACCOUNT_SYS_ENTER #endif -.section ".data.patch.rse", "a" +.section ".data..patch.rse", "a" .previous/*
@@ -215,7 +215,7 @@ (pUStk) extr.u r17=r18,3,6; \ (pUStk) sub r16=r18,r22; \ [1:](pKStk) br.cond.sptk.many 1f; \ - .xdata4 ".data.patch.rse",1b-. \ + .xdata4 ".data..patch.rse",1b-. \ ;; \ cmp.ge p6,p7 = 33,r17; \ ;; \
arch/ia64/kernel/vmlinux.lds.S +8 -8
@@ -75,10 +75,10 @@ SECTIONS __stop___mca_table = .; } - .data.patch.phys_stack_reg : AT(ADDR(.data.patch.phys_stack_reg) - LOAD_OFFSET) + .data..patch.phys_stack_reg : AT(ADDR(.data..patch.phys_stack_reg) - LOAD_OFFSET) { __start___phys_stack_reg_patchlist = .; - *(.data.patch.phys_stack_reg) + *(.data..patch.phys_stack_reg) __end___phys_stack_reg_patchlist = .; }
@@ -110,24 +110,24 @@ SECTIONS INIT_TEXT_SECTION(PAGE_SIZE) INIT_DATA_SECTION(16) - .data.patch.vtop : AT(ADDR(.data.patch.vtop) - LOAD_OFFSET) + .data..patch.vtop : AT(ADDR(.data..patch.vtop) - LOAD_OFFSET) { __start___vtop_patchlist = .; - *(.data.patch.vtop) + *(.data..patch.vtop) __end___vtop_patchlist = .; } - .data.patch.rse : AT(ADDR(.data.patch.rse) - LOAD_OFFSET) + .data..patch.rse : AT(ADDR(.data..patch.rse) - LOAD_OFFSET) { __start___rse_patchlist = .; - *(.data.patch.rse) + *(.data..patch.rse) __end___rse_patchlist = .; } - .data.patch.mckinley_e9 : AT(ADDR(.data.patch.mckinley_e9) - LOAD_OFFSET) + .data..patch.mckinley_e9 : AT(ADDR(.data..patch.mckinley_e9) - LOAD_OFFSET) { __start___mckinley_e9_bundles = .; - *(.data.patch.mckinley_e9) + *(.data..patch.mckinley_e9) __end___mckinley_e9_bundles = .; }
Signature · 1 line
1.6.2.4
PATCH 10/24 Rename .data[.percpu][.xxx] to .data[..percpu][..xxx].
In reply to Denys Vlasenko--- arch/ia64/include/asm/percpu.h | 2 +- include/asm-generic/percpu.h | 10 +++++----- include/asm-generic/vmlinux.lds.h | 24 ++++++++++++------------ include/linux/percpu-defs.h | 4 ++-- kernel/module.c | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-)
arch/ia64/include/asm/percpu.h +1 -1
@@ -31,7 +31,7 @@ extern void *per_cpu_init(void);#endif /* SMP */ -#define PER_CPU_BASE_SECTION ".data.percpu" +#define PER_CPU_BASE_SECTION ".data..percpu"/* * Be extremely careful when taking the address of this variable! Due to virtual
include/asm-generic/percpu.h +5 -5
@@ -76,7 +76,7 @@ extern void setup_per_cpu_areas(void);#ifndef PER_CPU_BASE_SECTION #ifdef CONFIG_SMP -#define PER_CPU_BASE_SECTION ".data.percpu" +#define PER_CPU_BASE_SECTION ".data..percpu"#else #define PER_CPU_BASE_SECTION ".data"#endif
@@ -88,15 +88,15 @@ extern void setup_per_cpu_areas(void);#define PER_CPU_SHARED_ALIGNED_SECTION ""#define PER_CPU_ALIGNED_SECTION ""#else -#define PER_CPU_SHARED_ALIGNED_SECTION ".shared_aligned" -#define PER_CPU_ALIGNED_SECTION ".shared_aligned" +#define PER_CPU_SHARED_ALIGNED_SECTION "..shared_aligned" +#define PER_CPU_ALIGNED_SECTION "..shared_aligned"#endif -#define PER_CPU_FIRST_SECTION ".first" +#define PER_CPU_FIRST_SECTION "..first"#else #define PER_CPU_SHARED_ALIGNED_SECTION "" -#define PER_CPU_ALIGNED_SECTION ".shared_aligned" +#define PER_CPU_ALIGNED_SECTION "..shared_aligned"#define PER_CPU_FIRST_SECTION ""#endif
include/asm-generic/vmlinux.lds.h +12 -12
@@ -666,16 +666,16 @@*/ #define PERCPU_VADDR (vaddr, phdr) \ VMLINUX_SYMBOL(__per_cpu_load) = .; \ - .data.percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \ + .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \ - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__per_cpu_start) = .; \ - *(.data.percpu.first) \ - *(.data.percpu.page_aligned) \ - *(.data.percpu) \ - *(.data.percpu.shared_aligned) \ + *(.data..percpu..first) \ + *(.data..percpu..page_aligned) \ + *(.data..percpu) \ + *(.data..percpu..shared_aligned) \ VMLINUX_SYMBOL(__per_cpu_end) = .; \ } phdr \ - . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data.percpu); + . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);/** * PERCPU - define output section for percpu area, simple version
@@ -687,18 +687,18 @@* * This macro is equivalent to ALIGN(align); PERCPU_VADDR( , ) except * that __per_cpu_load is defined as a relative symbol against -* .data.percpu which is required for relocatable x86_32 +* .data..percpu which is required for relocatable x86_32 * configuration. */ #define PERCPU (align) \ . = ALIGN(align); \ - .data.percpu : AT(ADDR(.data.percpu) - LOAD_OFFSET) { \ + .data..percpu : AT(ADDR(.data..percpu) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__per_cpu_load) = .; \ VMLINUX_SYMBOL(__per_cpu_start) = .; \ - *(.data.percpu.first) \ - *(.data.percpu.page_aligned) \ - *(.data.percpu) \ - *(.data.percpu.shared_aligned) \ + *(.data..percpu..first) \ + *(.data..percpu..page_aligned) \ + *(.data..percpu) \ + *(.data..percpu..shared_aligned) \ VMLINUX_SYMBOL(__per_cpu_end) = .; \ }
include/linux/percpu-defs.h +2 -2
@@ -127,11 +127,11 @@* Declaration/definition used for per-CPU variables that must be page aligned. */ #define DECLARE_PER_CPU_PAGE_ALIGNED (type, name) \ - DECLARE_PER_CPU_SECTION(type, name, ".page_aligned") \ + DECLARE_PER_CPU_SECTION(type, name, "..page_aligned") \ __aligned(PAGE_SIZE)#define DEFINE_PER_CPU_PAGE_ALIGNED (type, name) \ - DEFINE_PER_CPU_SECTION(type, name, ".page_aligned") \ + DEFINE_PER_CPU_SECTION(type, name, "..page_aligned") \ __aligned(PAGE_SIZE)/*
kernel/module.c +1 -1
@@ -397,7 +397,7 @@ static unsigned int find_pcpusec(Elf_Ehdr *hdr,Elf_Shdr *sechdrs, const char *secstrings) { - return find_sec(hdr, sechdrs, secstrings, ".data.percpu"); + return find_sec(hdr, sechdrs, secstrings, ".data..percpu"); }static void percpu_modcopy (void *pcpudest,const void *from,unsigned long size)
Signature · 1 line
1.6.2.4
PATCH 11/24 Rename .data.read_mostly to .data..read_mostly.
In reply to Denys Vlasenko--- arch/ia64/include/asm/cache.h | 2 +- arch/ia64/kernel/paravirtentry.S | 2 +- arch/ia64/xen/xensetup.S | 2 +- arch/parisc/include/asm/cache.h | 2 +- arch/parisc/kernel/head.S | 2 +- arch/powerpc/include/asm/cache.h | 2 +- arch/powerpc/kernel/vmlinux.lds.S | 2 +- arch/s390/include/asm/cache.h | 2 +- arch/sh/include/asm/cache.h | 2 +- arch/sparc/include/asm/cache.h | 2 +- arch/x86/include/asm/cache.h | 2 +- include/asm-generic/vmlinux.lds.h | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-)
arch/ia64/include/asm/cache.h +1 -1
@@ -24,6 +24,6 @@# define SMP_CACHE_BYTES (1 << 3)#endif -#define __read_mostly __attribute__((__section__(".data.read_mostly"))) +#define __read_mostly __attribute__((__section__(".data..read_mostly")))#endif /* _ASM_IA64_CACHE_H */
arch/ia64/kernel/paravirtentry.S +1 -1
@@ -28,7 +28,7 @@ #include "entry.h" #define DATA8(sym, init_value) \ - .pushsection .data.read_mostly ; \ + .pushsection .data..read_mostly ; \ .align 8 ; \ .global sym ; \ sym: ; \
arch/ia64/xen/xensetup.S +1 -1
@@ -14,7 +14,7 @@ #include <linux/init.h> #include <xen/interface/elfnote.h> - .section .data.read_mostly + .section .data..read_mostly .align 8 .global xen_domain_type xen_domain_type:
arch/parisc/include/asm/cache.h +1 -1
@@ -28,7 +28,7 @@#define SMP_CACHE_BYTES L1_CACHE_BYTES -#define __read_mostly __attribute__((__section__(".data.read_mostly"))) +#define __read_mostly __attribute__((__section__(".data..read_mostly")))void parisc_cache_init (void );/* initializes cache-flushing */ void disable_sr_hashing_asm (int );/* low level support for above */
arch/parisc/kernel/head.S +1 -1
@@ -345,7 +345,7 @@ smp_slave_stext: ENDPROC(stext) #ifndef CONFIG_64BIT - .section .data.read_mostly + .section .data..read_mostly .align 4 .export $global$,data
arch/powerpc/include/asm/cache.h +1 -1
@@ -38,7 +38,7 @@ extern struct ppc64_caches ppc64_caches;#endif /* __powerpc64__ && ! __ASSEMBLY__ */ #if !defined(__ASSEMBLY__) -#define __read_mostly __attribute__((__section__(".data.read_mostly"))) +#define __read_mostly __attribute__((__section__(".data..read_mostly")))#endif #endif /* __KERNEL__ */
arch/powerpc/kernel/vmlinux.lds.S +1 -1
@@ -233,7 +233,7 @@ SECTIONS CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES) } - .data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET) { + .data..read_mostly : AT(ADDR(.data..read_mostly) - LOAD_OFFSET) { READ_MOSTLY_DATA(L1_CACHE_BYTES) }
arch/s390/include/asm/cache.h +1 -1
@@ -14,6 +14,6 @@#define L1_CACHE_BYTES 256#define L1_CACHE_SHIFT 8 -#define __read_mostly __attribute__((__section__(".data.read_mostly"))) +#define __read_mostly __attribute__((__section__(".data..read_mostly")))#endif
arch/sh/include/asm/cache.h +1 -1
@@ -14,7 +14,7 @@#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) -#define __read_mostly __attribute__((__section__(".data.read_mostly"))) +#define __read_mostly __attribute__((__section__(".data..read_mostly")))#ifndef __ASSEMBLY__ struct cache_info {
arch/sparc/include/asm/cache.h +1 -1
@@ -19,7 +19,7 @@#define SMP_CACHE_BYTES (1 << SMP_CACHE_BYTES_SHIFT) -#define __read_mostly __attribute__((__section__(".data.read_mostly"))) +#define __read_mostly __attribute__((__section__(".data..read_mostly")))#ifdef CONFIG_SPARC32 #include <asm/asi.h>
arch/x86/include/asm/cache.h +1 -1
@@ -7,7 +7,7 @@#define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) -#define __read_mostly __attribute__((__section__(".data.read_mostly"))) +#define __read_mostly __attribute__((__section__(".data..read_mostly")))#define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
include/asm-generic/vmlinux.lds.h +1 -1
@@ -185,7 +185,7 @@#define READ_MOSTLY_DATA (align) \ . = ALIGN(align); \ - *(.data.read_mostly) + *(.data..read_mostly)#define CACHELINE_ALIGNED_DATA (align) \ . = ALIGN(align); \
Signature · 1 line
1.6.2.4
PATCH 12/24 Rename .data.vmpages and .data.vm0.xxx to .data..vmpages and .data..vm0.xxx.
In reply to Denys Vlasenko--- arch/parisc/kernel/init_task.c | 6 +++--- arch/parisc/kernel/vmlinux.lds.S | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-)
arch/parisc/kernel/init_task.c +3 -3
@@ -53,11 +53,11 @@ union thread_union init_thread_union __init_task_data* guarantee that global objects will be laid out in memory in the same order * as the order of declaration, so put these in different sections and use * the linker script to order them. */ -pmd_t pmd0[PTRS_PER_PMD] __attribute__ ((__section__ (".data.vm0.pmd"), aligned(PAGE_SIZE))); +pmd_t pmd0[PTRS_PER_PMD] __attribute__ ((__section__ (".data..vm0.pmd"), aligned(PAGE_SIZE)));#endif -pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__ ((__section__ (".data.vm0.pgd"), aligned(PAGE_SIZE))); -pte_t pg0[PT_INITIAL * PTRS_PER_PTE] __attribute__ ((__section__ (".data.vm0.pte"), aligned(PAGE_SIZE))); +pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__ ((__section__ (".data..vm0.pgd"), aligned(PAGE_SIZE))); +pte_t pg0[PT_INITIAL * PTRS_PER_PTE] __attribute__ ((__section__ (".data..vm0.pte"), aligned(PAGE_SIZE)));/* * Initial task structure.
arch/parisc/kernel/vmlinux.lds.S +4 -4
@@ -105,10 +105,10 @@ SECTIONS __bss_start = .; /* page table entries need to be PAGE_SIZE aligned */ . = ALIGN(PAGE_SIZE); - .data.vmpages : { - *(.data.vm0.pmd) - *(.data.vm0.pgd) - *(.data.vm0.pte) + .data..vmpages : { + *(.data..vm0.pmd) + *(.data..vm0.pgd) + *(.data..vm0.pte) } .bss : { *(.bss)
Signature · 1 line
1.6.2.4
PATCH 13/24 Rename .rodata.compressed to .rodata..compressed.
In reply to Denys Vlasenko--- arch/sh/boot/compressed/vmlinux.scr | 2 +- arch/x86/boot/compressed/mkpiggy.c | 2 +- arch/x86/boot/compressed/vmlinux.lds.S | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
arch/sh/boot/compressed/vmlinux.scr +1 -1
@@ -1,6 +1,6 @@ SECTIONS { - .rodata.compressed : { + .rodata..compressed : { input_len = .; LONG(input_data_end - input_data) input_data = .; *(.data)
arch/x86/boot/compressed/mkpiggy.c +1 -1
@@ -77,7 +77,7 @@ int main(int argc, char *argv[]) offs +=32 *1024 +18 ;/* Add 32K + 18 bytes slack */ offs = (offs+4095 ) & ~4095 ;/* Round to a 4K boundary */ -printf (".section \".rodata.compressed\",\"a\",@progbits\n" ); +printf (".section \".rodata..compressed\",\"a\",@progbits\n" );printf (".globl z_input_len\n" );printf ("z_input_len = %lu\n" , ilen);printf (".globl z_output_len\n" );
arch/x86/boot/compressed/vmlinux.lds.S +2 -2
@@ -26,8 +26,8 @@ SECTIONS HEAD_TEXT _ehead = . ; } - .rodata.compressed : { - *(.rodata.compressed) + .rodata..compressed : { + *(.rodata..compressed) } .text : { _text = .; /* Text */
Signature · 1 line
1.6.2.4
PATCH 14/24 Rename .text.ivt to .text..ivt.
In reply to Denys Vlasenko--- arch/ia64/kernel/ivt.S | 2 +- arch/ia64/kernel/vmlinux.lds.S | 2 +- arch/ia64/kvm/vmm_ivt.S | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/ia64/kernel/ivt.S +1 -1
@@ -83,7 +83,7 @@ mov r19=n;; /* prepare to save predicates */ \ br.sptk.many dispatch_to_fault_handler - .section .text.ivt,"ax" + .section .text..ivt,"ax" .align 32768 // align on 32KB boundary .global ia64_ivt
arch/ia64/kernel/vmlinux.lds.S +1 -1
@@ -8,7 +8,7 @@ #define IVT_TEXT \ VMLINUX_SYMBOL(__start_ivt_text) = .; \ - *(.text.ivt) \ + *(.text..ivt) \ VMLINUX_SYMBOL(__end_ivt_text) = .; OUTPUT_FORMAT("elf64-ia64-little")
arch/ia64/kvm/vmm_ivt.S +1 -1
@@ -104,7 +104,7 @@ GLOBAL_ENTRY(kvm_vmm_panic) br.call.sptk.many b6=vmm_panic_handler; END(kvm_vmm_panic) - .section .text.ivt,"ax" + .section .text..ivt,"ax" .align 32768 // align on 32KB boundary .global kvm_ia64_ivt
Signature · 1 line
1.6.2.4
PATCH 15/24 Rename .text.lock to .text..lock.
In reply to Denys Vlasenko--- Documentation/mutex-design.txt | 4 ++-- arch/ia64/kernel/vmlinux.lds.S | 4 ++-- arch/m68knommu/kernel/vmlinux.lds.S | 2 +- include/linux/spinlock.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
Documentation/mutex-design.txt +2 -2
@@ -66,14 +66,14 @@ of advantages of mutexes: c0377ccb <mutex_lock>: c0377ccb: f0 ff 08 lock decl (%eax) - c0377cce: 78 0e js c0377cde <.text.lock.mutex> + c0377cce: 78 0e js c0377cde <.text..lock.mutex> c0377cd0: c3 ret the unlocking fastpath is equally tight: c0377cd1 <mutex_unlock>: c0377cd1: f0 ff 00 lock incl (%eax) - c0377cd4: 7e 0f jle c0377ce5 <.text.lock.mutex+0x7> + c0377cd4: 7e 0f jle c0377ce5 <.text..lock.mutex+0x7> c0377cd6: c3 ret - 'struct mutex' semantics are well-defined and are enforced if
arch/ia64/kernel/vmlinux.lds.S +2 -2
@@ -54,8 +54,8 @@ SECTIONS .text2 : AT(ADDR(.text2) - LOAD_OFFSET) { *(.text2) } #ifdef CONFIG_SMP - .text.lock : AT(ADDR(.text.lock) - LOAD_OFFSET) - { *(.text.lock) } + .text..lock : AT(ADDR(.text..lock) - LOAD_OFFSET) + { *(.text..lock) } #endif _etext = .;
arch/m68knommu/kernel/vmlinux.lds.S +1 -1
@@ -68,7 +68,7 @@ SECTIONS { TEXT_TEXT SCHED_TEXT LOCK_TEXT - *(.text.lock) + *(.text..lock) . = ALIGN(16); /* Exception table */ __start___ex_table = .;
include/linux/spinlock.h +1 -1
@@ -60,7 +60,7 @@/* * Must define these before including other files, inline functions need them */ -#define LOCK_SECTION_NAME ".text.lock."KBUILD_BASENAME +#define LOCK_SECTION_NAME ".text..lock."KBUILD_BASENAME#define LOCK_SECTION_START (extra) \ ".subsection 1\n\t" \
Signature · 1 line
1.6.2.4
PATCH 16/24 Rename .text.page_aligned to .text..page_aligned.
In reply to Denys Vlasenko--- arch/x86/kernel/acpi/wakeup_32.S | 2 +- arch/x86/kernel/vmlinux.lds.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/acpi/wakeup_32.S +1 -1
@@ -1,4 +1,4 @@ - .section .text.page_aligned + .section .text..page_aligned #include <linux/linkage.h> #include <asm/segment.h> #include <asm/page_types.h>
arch/x86/kernel/vmlinux.lds.S +1 -1
@@ -97,7 +97,7 @@ SECTIONS HEAD_TEXT #ifdef CONFIG_X86_32 . = ALIGN(PAGE_SIZE); - *(.text.page_aligned) + *(.text..page_aligned) #endif . = ALIGN(8); _stext = .;
Signature · 1 line
1.6.2.4
PATCH 17/24 Rename .text.reset to .text..reset.
In reply to Denys Vlasenko--- arch/avr32/kernel/vmlinux.lds.S | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/avr32/kernel/vmlinux.lds.S +1 -1
@@ -26,7 +26,7 @@ SECTIONS _stext = .; __init_begin = .; _sinittext = .; - *(.text.reset) + *(.text..reset) INIT_TEXT /* * .exit.text is discarded at runtime, not
Signature · 1 line
1.6.2.4
Re: [PATCH 17/24] Rename .text.reset to .text..reset.
Haavard,
How does the .text.reset section get populated on the avr32 architecture?
As far as I can tell, there's no code in the kernel to put anything in the .text.reset section, yet the linker script places that section at the start of the text section.
-Tim Abbott
Quoted 22 lines · Denys Vlasenko
Signed-off-by Denys Vlasenko <[email protected]>--- arch/avr32/kernel/vmlinux.lds.S | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)arch/avr32/kernel/vmlinux.lds.S +1
-1@@ -26,7 +26,7 @@ SECTIONS _stext = .; __init_begin = .; _sinittext = .; - *(.text.reset) + *(.text..reset) INIT_TEXT /* * .exit.text is discarded at runtime, notSignature · 1 line
1.6.2.4
Re: [PATCH 17/24] Rename .text.reset to .text..reset.
Hi Tim,
Quoted 1 line · Tim Abbott
How does the .text.reset section get populated on the avr32 architecture?
It doesn't. Feel free to remove it from the linker script.
Quoted 3 lines
As far as I can tell, there's no code in the kernel to put anything in the .text.reset section, yet the linker script places that section at the start of the text section.
You're right, it's a leftover from some startup code which later got removed.
Haavard
Re: [PATCH 17/24] Rename .text.reset to .text..reset.
In reply to Denys Vlasenkoarch/avr32/kernel/vmlinux.lds.S SECTIONS · line 29
Quoted 10 lines · Denys Vlasenko
arch/avr32/kernel/vmlinux.lds.S +1
-1@@ -26,7 +26,7 @@ SECTIONS _stext = .; __init_begin = .; _sinittext = .; - *(.text.reset) + *(.text..reset)
Please remove it instead. I'm sure there's no code which actually places something in .text.reset, but if there is, this patch would break it in exactly the same way as removing it altogether would do.
Haavard
PATCH 18/24 Rename .text.startup to .text..startup.
In reply to Denys Vlasenko--- arch/h8300/boot/compressed/head.S | 2 +- arch/h8300/boot/compressed/vmlinux.lds | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/h8300/boot/compressed/head.S +1 -1
@@ -9,7 +9,7 @@ #define SRAM_START 0xff4000 - .section .text.startup + .section .text..startup .global startup startup: mov.l #SRAM_START+0x8000, sp
arch/h8300/boot/compressed/vmlinux.lds +1 -1
@@ -4,7 +4,7 @@ SECTIONS { __stext = . ; __text = .; - *(.text.startup) + *(.text..startup) *(.text) __etext = . ; }
Signature · 1 line
1.6.2.4
PATCH 19/24 Rename .data.nosave to .data..nosave.
In reply to Denys Vlasenko--- arch/s390/kernel/swsusp_asm64.S | 2 +- include/asm-generic/vmlinux.lds.h | 2 +- include/linux/init.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/s390/kernel/swsusp_asm64.S +1 -1
@@ -261,7 +261,7 @@ restore_registers: lghi %r2,0 br %r14 - .section .data.nosave,"aw",@progbits + .section .data..nosave,"aw",@progbits .align 8 .Ldisabled_wait_31: .long 0x000a0000,0x00000000
include/asm-generic/vmlinux.lds.h +1 -1
@@ -175,7 +175,7 @@#define NOSAVE_DATA \ . = ALIGN(PAGE_SIZE); \ VMLINUX_SYMBOL(__nosave_begin) = .; \ - *(.data.nosave) \ + *(.data..nosave) \ . = ALIGN(PAGE_SIZE); \ VMLINUX_SYMBOL(__nosave_end) = .;
include/linux/init.h +1 -1
@@ -301,7 +301,7 @@ void __init parse_early_options(char *cmdline);#endif /* Data marked not to be saved by software suspend */ -#define __nosavedata __section(.data.nosave) +#define __nosavedata __section(.data..nosave)/* This means "can be init if no module support, otherwise module load may call it." */
Signature · 1 line
1.6.2.4
PATCH 20/24 Rename .data.init to .data..init.
In reply to Denys Vlasenko--- arch/sparc/boot/btfixupprep.c | 2 +- arch/x86/kernel/setup_percpu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/sparc/boot/btfixupprep.c +1 -1
@@ -325,7 +325,7 @@ main1: (*rr)->next =NULL ; }printf ("! Generated by btfixupprep. Do not edit.\n\n" ); -printf ("\t.section\t\".data.init\",#alloc,#write\n\t.align\t4\n\n" ); +printf ("\t.section\t\".data..init\",#alloc,#write\n\t.align\t4\n\n" );printf ("\t.global\t___btfixup_start\n___btfixup_start:\n\n" );for (i =0 ; i < last; i++) { f = array + i;
arch/x86/kernel/setup_percpu.c +1 -1
@@ -241,7 +241,7 @@ void __init setup_per_cpu_areas(void)#endif #endif /* -* Up to this point, the boot CPU has been using .data.init +* Up to this point, the boot CPU has been using .init.data * area. Reload any changed state for the boot CPU. */ if (cpu == boot_cpu_id)
Signature · 1 line
1.6.2.4
PATCH 21/24 Rename .data.initvect to .data..initvect.
In reply to Denys Vlasenko--- arch/m68knommu/kernel/vmlinux.lds.S | 2 +- arch/m68knommu/platform/68360/head-ram.S | 2 +- arch/m68knommu/platform/68360/head-rom.S | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/m68knommu/kernel/vmlinux.lds.S +1 -1
@@ -57,7 +57,7 @@ SECTIONS { .romvec : { __rom_start = . ; _romvec = .; - *(.data.initvect) + *(.data..initvect) } > romvec #endif
arch/m68knommu/platform/68360/head-ram.S +1 -1
@@ -280,7 +280,7 @@ _dprbase: * and then overwritten as needed. */ -.section ".data.initvect","awx" +.section ".data..initvect","awx" .long RAMEND /* Reset: Initial Stack Pointer - 0. */ .long _start /* Reset: Initial Program Counter - 1. */ .long buserr /* Bus Error - 2. */
arch/m68knommu/platform/68360/head-rom.S +1 -1
@@ -291,7 +291,7 @@ _dprbase: * and then overwritten as needed. */ -.section ".data.initvect","awx" +.section ".data..initvect","awx" .long RAMEND /* Reset: Initial Stack Pointer - 0. */ .long _start /* Reset: Initial Program Counter - 1. */ .long buserr /* Bus Error - 2. */
Signature · 1 line
1.6.2.4
PATCH 22/24 Rename .data.lock_aligned to .data..lock_aligned.
In reply to Denys Vlasenko--- arch/parisc/include/asm/system.h | 2 +- arch/parisc/kernel/vmlinux.lds.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/parisc/include/asm/system.h +1 -1
@@ -174,7 +174,7 @@ static inline void set_eiem(unsigned long val) })#ifdef CONFIG_SMP -# define __lock_aligned __attribute__((__section__(".data.lock_aligned"))) +# define __lock_aligned __attribute__((__section__(".data..lock_aligned")))#endif #define arch_align_stack (x) (x)
arch/parisc/kernel/vmlinux.lds.S +2 -2
@@ -94,8 +94,8 @@ SECTIONS /* PA-RISC locks requires 16-byte alignment */ . = ALIGN(16); - .data.lock_aligned : { - *(.data.lock_aligned) + .data..lock_aligned : { + *(.data..lock_aligned) } /* End of data section */
Signature · 1 line
1.6.2.4
PATCH 23/24 Rename special text sections in arch/frv from .text.xxx to .text..xxx.
In reply to Denys Vlasenko--- arch/frv/kernel/break.S | 2 +- arch/frv/kernel/entry.S | 2 +- arch/frv/kernel/head.S | 2 +- arch/frv/kernel/vmlinux.lds.S | 8 ++++---- arch/frv/mm/tlb-miss.S | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-)
arch/frv/kernel/break.S +1 -1
@@ -63,7 +63,7 @@ __break_trace_through_exceptions: # entry point for Break Exceptions/Interrupts # ############################################################################### - .section .text.break + .section .text..break .balign 4 .globl __entry_break __entry_break:
arch/frv/kernel/entry.S +1 -1
@@ -38,7 +38,7 @@ #define nr_syscalls ((syscall_table_size)/4) - .section .text.entry + .section .text..entry .balign 4 .macro LEDS val
arch/frv/kernel/head.S +1 -1
@@ -542,7 +542,7 @@ __head_end: .size _boot, .-_boot # provide a point for GDB to place a break - .section .text.start,"ax" + .section .text..start,"ax" .globl _start .balign 4 _start:
arch/frv/kernel/vmlinux.lds.S +4 -4
@@ -57,10 +57,10 @@ SECTIONS _text = .; _stext = .; .text : { - *(.text.start) - *(.text.entry) - *(.text.break) - *(.text.tlbmiss) + *(.text..start) + *(.text..entry) + *(.text..break) + *(.text..tlbmiss) TEXT_TEXT SCHED_TEXT LOCK_TEXT
arch/frv/mm/tlb-miss.S +1 -1
@@ -15,7 +15,7 @@ #include <asm/pgtable.h> #include <asm/spr-regs.h> - .section .text.tlbmiss + .section .text..tlbmiss .balign 4 .globl __entry_insn_mmu_miss
Signature · 1 line
1.6.2.4
PATCH 24/24 Rename .text.start to .text..start.
In reply to Denys Vlasenko--- arch/mips/lasat/image/head.S | 2 +- arch/mips/lasat/image/romscript.normal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/mips/lasat/image/head.S +1 -1
@@ -1,7 +1,7 @@ #include <asm/lasat/head.h> .text - .section .text.start, "ax" + .section .text..start, "ax" .set noreorder .set mips3
arch/mips/lasat/image/romscript.normal +1 -1
@@ -4,7 +4,7 @@ SECTIONS { .text : { - *(.text.start) + *(.text..start) } /* Data in ROM */
Signature · 1 line
1.6.2.4
Quoted 4 lines · Denys Vlasenko
Hi Michal, Sam, folks,
Here is a new version of the -ffunction-sections -fdata-sections patch series based on current Linus tree.
Denys,
Not read all your patches. But I had recently the problem that I need a generic way to check for a symbol being inside the kernel image (text or data). There wasn't a common symbol that worked for both XIP ARM and normal architectures. Is this something addressed by your patchkit?
It essentially needs common symbol(s) that can be used to check for the kernel image itself.
-Andi
Hi Andi,
Quoted 9 lines · Andi Kleen
Quoted 3 lines · Denys Vlasenko
Hi Michal, Sam, folks,
Here is a new version of the -ffunction-sections -fdata-sections patch series based on current Linus tree.Denys,
Not read all your patches. But I had recently the problem that I need a generic way to check for a symbol being inside the kernel image (text or data).
I'm not sure I understood the problem.
Quoted 3 lines
There wasn't
a common symbol that worked for both XIP ARM and normal architectures. Is this something addressed by your patchkit?
Most likely not.
Signature · 1 line
vda
Quoted 2 lines · Denys Vlasenko
Here is a new version of the -ffunction-sections -fdata-sections patch series based on current Linus tree.
Aside from patch 17, which I would prefer that Haavard review, these patches look correct (and patch 17 can be safely dropped). Please consider the rest of Denys' patches in this patch series
The patches still apply fine on Linus' current master. There are no merge conflicts with linux-next's current master, but we will need to do something to merge with
"Blackfin: initial XIP support"
in linux-next, which introduces a direct reference to .data.percpu.* (not using the normal PERCPU macros so they can put .data.percpu content inside the .init.data section). That conflict looks easy to deal with by adding a new macro to handle this case (CCing the author and blackfin maintainer; it's possible that this blackfin patch is going in soon, in which case we can just rebase these patches on top).
Michal, what are your thoughts on this patch series? The kbuild tree would be a reasonable path for merging these patches.
-Tim Abbott
Quoted 10 lines · Tim Abbott
Quoted 2 lines · Denys Vlasenko
Here is a new version of the -ffunction-sections -fdata-sections patch series based on current Linus tree.
Aside from patch 17, which I would prefer that Haavard review, these patches look correct (and patch 17 can be safely dropped). Please consider the rest of Denys' patches in this patch series
Acked-by Tim Abbott <[email protected]>
Thanks.
Quoted 4 lines
[...]
Michal, what are your thoughts on this patch series? The kbuild tree would be a reasonable path for merging these patches.
Yes it would. I'm sorry, I was a bit bussy last two weeks. I'll do some random tests and add the patches to kbuild-next now. The patches look simple enough for me and don't actually change any functionality if one doesn't deliberately use -ffunction-sections -fdata-sections, so I hope Linus will be fine with merging it for 2.6.34.
Michal
Quoted 23 lines · Tim Abbott
Quoted 2 lines · Denys Vlasenko
Here is a new version of the -ffunction-sections -fdata-sections patch series based on current Linus tree.
Aside from patch 17, which I would prefer that Haavard review, these patches look correct (and patch 17 can be safely dropped). Please consider the rest of Denys' patches in this patch series
Acked-by Tim Abbott <[email protected]>The patches still apply fine on Linus' current master. There are no merge conflicts with linux-next's current master, but we will need to do something to merge with
"Blackfin: initial XIP support"
in linux-next, which introduces a direct reference to .data.percpu.* (not using the normal PERCPU macros so they can put .data.percpu content inside the .init.data section). That conflict looks easy to deal with by adding a new macro to handle this case (CCing the author and blackfin maintainer; it's possible that this blackfin patch is going in soon, in which case we can just rebase these patches on top).
Quoted 2 lines
Michal, what are your thoughts on this patch series? The kbuild tree would be a reasonable path for merging these patches.
ive posted this patch for merging via the Blackfin tree now, so hopefully it'll be in soon
-mike
These look reasonable. Do you have a GIT tree I can pull?
David