cleanup old init and refok sections
Subsystems (6)
cover cleanup old init and refok sections
Sam,
This patch series cleans up the use of the deprecated section names .text.init, .text.init.refok, .exit.text.refok, and .data.init.refok in the Linux kernel, replacing them with the appropriate macros that reference the current names for these sections.
The long-term goal here is to be able to change the kernel's magic section names to those that are compatible with -ffunction-sections -fdata-sections. Doing so requires renaming all magic sections with names of the form ".text.foo" or ".data.bar".
--
Tim Abbott (8):
frv: Remove unused header asm/init.h.
frv: Use __INIT macro instead of .text.init.
arm: Use __INIT macro instead of .text.init.
powerpc: Use TEXT_TEXT macro in linker script.
powerpc: Use __REF macro instead of old .text.init.refok.
sh: Use __INIT macro instead of .text.init.
sparc: cleanup references to deprecated .text.init* sections. Remove unused support code for refok sections.
arch/arm/mm/proc-v6.S | 3 ++- arch/arm/mm/proc-v7.S | 3 ++- arch/arm/mm/tlb-v6.S | 3 ++- arch/arm/mm/tlb-v7.S | 3 ++- arch/frv/include/asm/init.h | 12 ------------ arch/frv/kernel/head-mmu-fr451.S | 3 ++- arch/frv/kernel/head-uc-fr401.S | 3 ++- arch/frv/kernel/head-uc-fr451.S | 3 ++- arch/frv/kernel/head-uc-fr555.S | 3 ++- arch/powerpc/include/asm/ppc_asm.h | 5 +++-- arch/powerpc/kernel/vmlinux.lds.S | 3 ++- arch/sh/kernel/cpu/sh5/entry.S | 5 +++-- arch/sparc/kernel/head_32.S | 2 +- arch/sparc/kernel/head_64.S | 2 +- include/asm-generic/vmlinux.lds.h | 3 --- include/linux/init.h | 8 -------- scripts/mod/modpost.c | 18 ------------------ 17 files changed, 26 insertions(+), 56 deletions(-) delete mode 100644 arch/frv/include/asm/init.h
PATCH 1/8 frv: Remove unused header asm/init.h.
It seems nothing has included the frv asm/init.h header for some time, and its actual contents are out of date with include/linux/init.h. So just delete it.
--- arch/frv/include/asm/init.h | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) delete mode 100644 arch/frv/include/asm/init.h
arch/frv/include/asm/init.h deleted +0 -12
@@ -1,12 +0,0 @@ -#ifndef _ASM_INIT_H -#define _ASM_INIT_H - -#define __init __attribute__ ((__section__ (".text.init"))) -#define __initdata __attribute__ ((__section__ (".data.init"))) -/* For assembly routines */ -#define __INIT .section ".text.init",#alloc,#execinstr -#define __FINIT .previous -#define __INITDATA .section ".data.init",#alloc,#write - -#endif -
Signature · 1 line
1.6.2.1
PATCH 2/8 frv: Use __INIT macro instead of .text.init.
frv is placing some code in the .text.init section but does not reference that section in its linker scripts.
This change moves this code from the .text.init section to the .init.text section, which is presumably where it belongs.
--- arch/frv/kernel/head-mmu-fr451.S | 3 ++- arch/frv/kernel/head-uc-fr401.S | 3 ++- arch/frv/kernel/head-uc-fr451.S | 3 ++- arch/frv/kernel/head-uc-fr555.S | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-)
arch/frv/kernel/head-mmu-fr451.S +2 -1
@@ -9,6 +9,7 @@ * 2 of the License, or (at your option) any later version. */ +#include <linux/init.h> #include <linux/threads.h> #include <linux/linkage.h> #include <asm/ptrace.h>
@@ -31,7 +32,7 @@ #define __400_LCR 0xfe000100 #define __400_LSBR 0xfe000c00 - .section .text.init,"ax" + __INIT .balign 4 ###############################################################################
arch/frv/kernel/head-uc-fr401.S +2 -1
@@ -9,6 +9,7 @@ * 2 of the License, or (at your option) any later version. */ +#include <linux/init.h> #include <linux/threads.h> #include <linux/linkage.h> #include <asm/ptrace.h>
@@ -30,7 +31,7 @@ #define __400_LCR 0xfe000100 #define __400_LSBR 0xfe000c00 - .section .text.init,"ax" + __INIT .balign 4 ###############################################################################
arch/frv/kernel/head-uc-fr451.S +2 -1
@@ -9,6 +9,7 @@ * 2 of the License, or (at your option) any later version. */ +#include <linux/init.h> #include <linux/threads.h> #include <linux/linkage.h> #include <asm/ptrace.h>
@@ -30,7 +31,7 @@ #define __400_LCR 0xfe000100 #define __400_LSBR 0xfe000c00 - .section .text.init,"ax" + __INIT .balign 4 ###############################################################################
arch/frv/kernel/head-uc-fr555.S +2 -1
@@ -9,6 +9,7 @@ * 2 of the License, or (at your option) any later version. */ +#include <linux/init.h> #include <linux/threads.h> #include <linux/linkage.h> #include <asm/ptrace.h>
@@ -29,7 +30,7 @@ #define __551_LCR 0xfeff1100 #define __551_LSBR 0xfeff1c00 - .section .text.init,"ax" + __INIT .balign 4 ###############################################################################
Signature · 1 line
1.6.2.1
PATCH 3/8 arm: Use __INIT macro instead of .text.init.
arm is placing some code in the .text.init section, but it does not reference that section in its linker scripts.
This change moves this code from the .text.init section to the .init.text section, which is presumably where it belongs.
--- arch/arm/mm/proc-v6.S | 3 ++- arch/arm/mm/proc-v7.S | 3 ++- arch/arm/mm/tlb-v6.S | 3 ++- arch/arm/mm/tlb-v7.S | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-)
arch/arm/mm/proc-v6.S +2 -1
@@ -10,6 +10,7 @@ * * This is the "shell" of the ARMv6 processor support. */ +#include <linux/init.h> #include <linux/linkage.h> #include <asm/assembler.h> #include <asm/asm-offsets.h>
@@ -132,7 +133,7 @@ cpu_v6_name: .asciz "ARMv6-compatible processor" .align - .section ".text.init", #alloc, #execinstr + __INIT /* * __v6_setup
arch/arm/mm/proc-v7.S +2 -1
@@ -9,6 +9,7 @@ * * This is the "shell" of the ARMv7 processor support. */ +#include <linux/init.h> #include <linux/linkage.h> #include <asm/assembler.h> #include <asm/asm-offsets.h>
@@ -153,7 +154,7 @@ cpu_v7_name: .ascii "ARMv7 Processor" .align - .section ".text.init", #alloc, #execinstr + __INIT /* * __v7_setup
arch/arm/mm/tlb-v6.S +2 -1
@@ -10,6 +10,7 @@ * ARM architecture version 6 TLB handling functions. * These assume a split I/D TLB. */ +#include <linux/init.h> #include <linux/linkage.h> #include <asm/asm-offsets.h> #include <asm/page.h>
@@ -87,7 +88,7 @@ ENTRY(v6wbi_flush_kern_tlb_range) mcr p15, 0, r2, c7, c5, 4 @ prefetch flush mov pc, lr - .section ".text.init", #alloc, #execinstr + __INIT .type v6wbi_tlb_fns, #object ENTRY(v6wbi_tlb_fns)
arch/arm/mm/tlb-v7.S +2 -1
@@ -11,6 +11,7 @@ * ARM architecture version 6 TLB handling functions. * These assume a split I/D TLB. */ +#include <linux/init.h> #include <linux/linkage.h> #include <asm/asm-offsets.h> #include <asm/page.h>
@@ -80,7 +81,7 @@ ENTRY(v7wbi_flush_kern_tlb_range) mov pc, lr ENDPROC(v7wbi_flush_kern_tlb_range) - .section ".text.init", #alloc, #execinstr + __INIT .type v7wbi_tlb_fns, #object ENTRY(v7wbi_tlb_fns)
Signature · 1 line
1.6.2.1
PATCH 4/8 powerpc: Use TEXT_TEXT macro in linker script.
Rather than adding .ref.text to the powerpc linker script so that we can use __REF on the powerpc architecture, it seems simpler to switch to using the generic TEXT_TEXT macro.
--- arch/powerpc/kernel/vmlinux.lds.S | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
arch/powerpc/kernel/vmlinux.lds.S +2 -1
@@ -54,7 +54,8 @@ SECTIONS ALIGN_FUNCTION(); HEAD_TEXT _text = .; - *(.text .fixup .text.init.refok .exit.text.refok __ftr_alt_*) + TEXT_TEXT + *(.fixup __ftr_alt_*) SCHED_TEXT LOCK_TEXT KPROBES_TEXT
Signature · 1 line
1.6.2.1
PATCH 5/8 powerpc: Use __REF macro instead of old .text.init.refok.
The section .text.init.refok is deprecated and __REF (.ref.text) should be used in assembly files instead. This patch cleans up a few uses of .text.init.refok in the powerpc architecture.
--- arch/powerpc/include/asm/ppc_asm.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
arch/powerpc/include/asm/ppc_asm.h +3 -2
@@ -4,6 +4,7 @@#ifndef _ASM_POWERPC_PPC_ASM_H#define _ASM_POWERPC_PPC_ASM_H +#include <linux/init.h> #include <linux/stringify.h> #include <asm/asm-compat.h> #include <asm/processor.h>
@@ -189,7 +190,7 @@ name: \ GLUE(.,name):#define _INIT_GLOBAL (name) \ - .section ".text.init.refok"; \ + __REF; \ .align 2 ; \ .globl name; \ .globl GLUE(.,name); \
@@ -229,7 +230,7 @@ name: \ GLUE(.,name):#define _INIT_STATIC (name) \ - .section ".text.init.refok"; \ + __REF; \ .align 2 ; \ .section ".opd","aw"; \ name: \
Signature · 1 line
1.6.2.1
PATCH 6/8 sh: Use __INIT macro instead of .text.init.
The sh architecture has some code in the .text.init section, but it does not reference that section in its linker scripts.
This change moves this code from the .text.init section to the .init.text section, which is presumably where it belongs.
--- arch/sh/kernel/cpu/sh5/entry.S | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
arch/sh/kernel/cpu/sh5/entry.S +3 -2
@@ -10,6 +10,7 @@ * for more details. */ #include <linux/errno.h> +#include <linux/init.h> #include <linux/sys.h> #include <cpu/registers.h> #include <asm/processor.h>
@@ -2058,10 +2059,10 @@ asm_uaccess_end: /* - * --- .text.init Section + * --- .init.text Section */ - .section .text.init, "ax" + __INIT /* * void trap_init (void)
Signature · 1 line
1.6.2.1
PATCH 7/8 sparc: cleanup references to deprecated .text.init* sections.
The section .text.init.refok is deprecated and __REF (.ref.text) should be used in assembly files instead. This patch cleans up a few uses of .text.init.refok in the sparc architecture.
Also fix a reference to .text.init in a comment that wasn't updated to .init.text.
--- arch/sparc/kernel/head_32.S | 2 +- arch/sparc/kernel/head_64.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/sparc/kernel/head_32.S +1 -1
@@ -735,7 +735,7 @@ go_to_highmem: nop /* The code above should be at beginning and we have to take care about - * short jumps, as branching to .text.init section from .text is usually + * short jumps, as branching to .init.text section from .text is usually * impossible */ __INIT /* Acquire boot time privileged register values, this will help debugging.
arch/sparc/kernel/head_64.S +1 -1
@@ -467,7 +467,7 @@ jump_to_sun4u_init: jmpl %g2 + %g0, %g0 nop - .section .text.init.refok + __REF sun4u_init: BRANCH_IF_SUN4V(g1, sun4v_init)
Signature · 1 line
1.6.2.1
PATCH 8/8 Remove unused support code for refok sections.
The old refok sections
.text.init.refok
.data.init.refok
.exit.text.refok
have been deprecated since commit 312b1485fb509c9bc32eda28ad29537896658cb8. After the other patches in this patch series nothing is put in these sections, so clean things up by eliminating all the remaining references to them.
--- include/asm-generic/vmlinux.lds.h | 3 --- include/linux/init.h | 8 -------- scripts/mod/modpost.c | 18 ------------------ 3 files changed, 0 insertions(+), 29 deletions(-)
include/asm-generic/vmlinux.lds.h +0 -3
@@ -90,7 +90,6 @@/* .data section */ #define DATA_DATA \ *(.data) \ - *(.data.init.refok) \ *(.ref.data) \ DEV_KEEP(init.data) \ DEV_KEEP(exit.data) \
@@ -289,8 +288,6 @@ *(.text.hot) \ *(.text) \ *(.ref.text) \ - *(.text.init.refok) \ - *(.exit.text.refok) \ DEV_KEEP(init.text) \ DEV_KEEP(exit.text) \CPU_KEEP (init.text) \
include/linux/init.h +0 -8
@@ -62,14 +62,6 @@#define __refdata __section(.ref.data)#define __refconst __section(.ref.rodata) -/* backward compatibility note -* A few places hardcode the old section names: -* .text.init.refok -* .data.init.refok -* .exit.text.refok -* They should be converted to use the defines from this file -*/ -/* compatibility defines */ #define __init_refok __ref#define __initdata_refok __refdata
scripts/mod/modpost.c +0 -18
@@ -794,15 +794,6 @@ static const char *init_exit_sections[] =/* data section */ static const char *data_sections[] = {DATA_SECTIONS ,NULL }; -/* sections that may refer to an init/exit section with no warning */ -static const char *initref_sections[] = -{ -".text.init.refok*" , -".exit.text.refok*" , -".data.init.refok*" , -NULL -}; -/* symbols in .data that may refer to init/exit sections */ static const char *symbol_white_list[] =
@@ -915,11 +906,6 @@ static int section_mismatch(const char *fromsec, const char *tosec)/** * Whitelist to allow certain references to pass with no warning. * -* Pattern 0: -* Do not warn if funtion/data are marked with __init_refok/__initdata_refok. -* The pattern is identified by: -* fromsec = .text.init.refok* | .data.init.refok* -* * Pattern 1: * If a module parameter is declared __initdata and permissions=0 * then this is legal despite the warning generated.
@@ -958,10 +944,6 @@ static int section_mismatch(const char *fromsec, const char *tosec)static int secref_whitelist (const char *fromsec,const char *fromsym,const char *tosec,const char *tosym) { -/* Check for pattern 0 */ -if (match (fromsec, initref_sections)) -return 0 ; -/* Check for pattern 1 */ if (match(tosec, init_data_sections) && match(fromsec, data_sections) &&
Signature · 1 line
1.6.2.1
Re: [PATCH 8/8] Remove unused support code for refok sections.
Quoted 6 lines · Tim Abbott
The old refok sections
.text.init.refok
.data.init.refok
.exit.text.refok
Quoted 7 lines
have been deprecated since commit
312b1485fb509c9bc32eda28ad29537896658cb8. After the other patches in this patch series nothing is put in these sections, so clean things up by eliminating all the remaining references to them.Signed-off-by Tim Abbott <[email protected]>Cc Sam Ravnborg <[email protected]>
I like this cleanup!
Quoted 92 lines
--- include/asm-generic/vmlinux.lds.h | 3 --- include/linux/init.h | 8 -------- scripts/mod/modpost.c | 18 ------------------ 3 files changed, 0 insertions(+), 29 deletions(-)include/asm-generic/vmlinux.lds.h +0
-3@@ -90,7 +90,6 @@/* .data section */ #define DATA_DATA \ *(.data) \ - *(.data.init.refok) \ *(.ref.data) \ DEV_KEEP(init.data) \ DEV_KEEP(exit.data) \@@ -289,8 +288,6 @@ *(.text.hot) \ *(.text) \ *(.ref.text) \ - *(.text.init.refok) \ - *(.exit.text.refok) \ DEV_KEEP(init.text) \ DEV_KEEP(exit.text) \CPU_KEEP (init.text) \include/linux/init.h +0
-8@@ -62,14 +62,6 @@#define __refdata __section(.ref.data)#define __refconst __section(.ref.rodata) -/* backward compatibility note -* A few places hardcode the old section names: -* .text.init.refok -* .data.init.refok -* .exit.text.refok -* They should be converted to use the defines from this file -*/ -/* compatibility defines */ #define __init_refok __ref#define __initdata_refok __refdatascripts/mod/modpost.c +0
-18@@ -794,15 +794,6 @@ static const char *init_exit_sections[] =/* data section */ static const char *data_sections[] = {DATA_SECTIONS ,NULL }; -/* sections that may refer to an init/exit section with no warning */ -static const char *initref_sections[] = -{ -".text.init.refok*" , -".exit.text.refok*" , -".data.init.refok*" , -NULL -}; -/* symbols in .data that may refer to init/exit sections */ static const char *symbol_white_list[] =@@ -915,11 +906,6 @@ static int section_mismatch(const char *fromsec, const char *tosec)/** * Whitelist to allow certain references to pass with no warning. * -* Pattern 0: -* Do not warn if funtion/data are marked with __init_refok/__initdata_refok. -* The pattern is identified by: -* fromsec = .text.init.refok* | .data.init.refok* -* * Pattern 1: * If a module parameter is declared __initdata and permissions=0 * then this is legal despite the warning generated. @@ -958,10 +944,6 @@ static int section_mismatch(const char *fromsec, const char *tosec)static int secref_whitelist (const char *fromsec,const char *fromsym,const char *tosec,const char *tosym) { -/* Check for pattern 0 */ -if (match (fromsec, initref_sections)) -return 0 ; -/* Check for pattern 1 */ if (match(tosec, init_data_sections) && match(fromsec, data_sections) &&Signature · 1 line
1.6.2.1
Re: [PATCH 7/8] sparc: cleanup references to deprecated .text.init* sections.
In reply to Tim AbbottQuoted 9 lines · Tim Abbott
The section .text.init.refok is deprecated and
__REF(.ref.text) should be used in assembly files instead. This patch cleans up a few uses of .text.init.refok in the sparc architecture.Also fix a reference to .text.init in a comment that wasn't updated to .init.text.
Signed-off-by Tim Abbott <[email protected]>Cc David S. Miller <[email protected]>
Quoted 34 lines
--- arch/sparc/kernel/head_32.S | 2 +- arch/sparc/kernel/head_64.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)arch/sparc/kernel/head_32.S +1
-1@@ -735,7 +735,7 @@ go_to_highmem: nop /* The code above should be at beginning and we have to take care about - * short jumps, as branching to .text.init section from .text is usually + * short jumps, as branching to .init.text section from .text is usually * impossible */ __INIT /* Acquire boot time privileged register values, this will help debugging.arch/sparc/kernel/head_64.S +1
-1@@ -467,7 +467,7 @@ jump_to_sun4u_init: jmpl %g2 + %g0, %g0 nop - .section .text.init.refok + __REF sun4u_init: BRANCH_IF_SUN4V(g1, sun4v_init)Signature · 1 line
1.6.2.1
Re: [PATCH 6/8] sh: Use __INIT macro instead of .text.init.
In reply to Tim AbbottQuoted 8 lines · Tim Abbott
The sh architecture has some code in the .text.init section, but it does not reference that section in its linker scripts.
This change moves this code from the .text.init section to the .init.text section, which is presumably where it belongs.
Signed-off-by Tim Abbott <[email protected]>Cc Paul Mundt <[email protected]>
Quoted 32 lines
--- arch/sh/kernel/cpu/sh5/entry.S | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)arch/sh/kernel/cpu/sh5/entry.S +3
-2@@ -10,6 +10,7 @@ * for more details. */ #include <linux/errno.h> +#include <linux/init.h> #include <linux/sys.h> #include <cpu/registers.h> #include <asm/processor.h>@@ -2058,10 +2059,10 @@ asm_uaccess_end: /* - * --- .text.init Section + * --- .init.text Section */ - .section .text.init, "ax" + __INIT /* * void trap_init (void)Signature · 1 line
1.6.2.1
Re: [PATCH 6/8] sh: Use __INIT macro instead of .text.init.
In reply to Tim AbbottQuoted 8 lines · Tim Abbott
The sh architecture has some code in the .text.init section, but it does not reference that section in its linker scripts.
This change moves this code from the .text.init section to the .init.text section, which is presumably where it belongs.
Signed-off-by Tim Abbott <[email protected]>Cc Paul Mundt <[email protected]>
Re: [PATCH 5/8] powerpc: Use __REF macro instead of old .text.init.refok.
In reply to Tim AbbottQuoted 6 lines · Tim Abbott
The section .text.init.refok is deprecated and
__REF(.ref.text) should be used in assembly files instead. This patch cleans up a few uses of .text.init.refok in the powerpc architecture.Signed-off-by Tim Abbott <[email protected]>Cc Benjamin Herrenschmidt <[email protected]>
Quoted 37 lines
--- arch/powerpc/include/asm/ppc_asm.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)arch/powerpc/include/asm/ppc_asm.h +3
-2@@ -4,6 +4,7 @@#ifndef _ASM_POWERPC_PPC_ASM_H#define _ASM_POWERPC_PPC_ASM_H +#include <linux/init.h> #include <linux/stringify.h> #include <asm/asm-compat.h> #include <asm/processor.h> @@ -189,7 +190,7 @@ name: \ GLUE(.,name):#define _INIT_GLOBAL (name) \ - .section ".text.init.refok"; \ + __REF; \ .align 2 ; \ .globl name; \ .globl GLUE(.,name); \@@ -229,7 +230,7 @@ name: \ GLUE(.,name):#define _INIT_STATIC (name) \ - .section ".text.init.refok"; \ + __REF; \ .align 2 ; \ .section ".opd","aw"; \ name: \Signature · 1 line
1.6.2.1
Re: [PATCH 4/8] powerpc: Use TEXT_TEXT macro in linker script.
In reply to Tim AbbottQuoted 6 lines · Tim Abbott
Rather than adding .ref.text to the powerpc linker script so that we can use
__REFon the powerpc architecture, it seems simpler to switch to using the genericTEXT_TEXTmacro.Signed-off-by Tim Abbott <[email protected]>Cc Benjamin Herrenschmidt <[email protected]>
Quoted 21 lines
--- arch/powerpc/kernel/vmlinux.lds.S | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)arch/powerpc/kernel/vmlinux.lds.S +2
-1@@ -54,7 +54,8 @@ SECTIONS ALIGN_FUNCTION(); HEAD_TEXT _text = .; - *(.text .fixup .text.init.refok .exit.text.refok __ftr_alt_*) + TEXT_TEXT + *(.fixup __ftr_alt_*) SCHED_TEXT LOCK_TEXT KPROBES_TEXTSignature · 1 line
1.6.2.1
Re: [PATCH 3/8] arm: Use __INIT macro instead of .text.init.
In reply to Tim AbbottQuoted 5 lines · Tim Abbott
arm is placing some code in the .text.init section, but it does not reference that section in its linker scripts.
This change moves this code from the .text.init section to the .init.text section, which is presumably where it belongs.
It looks obviously correct.
But I tried and failed to follow the chain of usage.
So we need an ack from Russell on this one.
Sam
Russell King
Acked-byRe: [PATCH 3/8] arm: Use __INIT macro instead of .text.init.
Quoted 9 lines · Sam Ravnborg
Quoted 5 lines · Tim Abbott
arm is placing some code in the .text.init section, but it does not reference that section in its linker scripts.
This change moves this code from the .text.init section to the .init.text section, which is presumably where it belongs.
It looks obviously correct.
But I tried and failed to follow the chain of usage.
Yup, I did something similar with the other files some year ago, but these new files got missed.
Quoted 1 line
So we need an ack from Russell on this one.
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of:
Re: [PATCH 2/8] frv: Use __INIT macro instead of .text.init.
In reply to Tim AbbottQuoted 5 lines · Tim Abbott
frv is placing some code in the .text.init section but does not reference that section in its linker scripts.
This change moves this code from the .text.init section to the .init.text section, which is presumably where it belongs.
I checked a few of the assembler entries - they where all called from __HEAD section.
So this change looks good.
Quoted 3 lines
Signed-off-by Tim Abbott <[email protected]>Cc David Howells <[email protected]>
Quoted 94 lines
--- arch/frv/kernel/head-mmu-fr451.S | 3 ++- arch/frv/kernel/head-uc-fr401.S | 3 ++- arch/frv/kernel/head-uc-fr451.S | 3 ++- arch/frv/kernel/head-uc-fr555.S | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-)arch/frv/kernel/head-mmu-fr451.S +2
-1@@ -9,6 +9,7 @@ * 2 of the License, or (at your option) any later version. */ +#include <linux/init.h> #include <linux/threads.h> #include <linux/linkage.h> #include <asm/ptrace.h>@@ -31,7 +32,7 @@ #define __400_LCR 0xfe000100 #define __400_LSBR 0xfe000c00 - .section .text.init,"ax" + __INIT .balign 4 ###############################################################################arch/frv/kernel/head-uc-fr401.S +2
-1@@ -9,6 +9,7 @@ * 2 of the License, or (at your option) any later version. */ +#include <linux/init.h> #include <linux/threads.h> #include <linux/linkage.h> #include <asm/ptrace.h>@@ -30,7 +31,7 @@ #define __400_LCR 0xfe000100 #define __400_LSBR 0xfe000c00 - .section .text.init,"ax" + __INIT .balign 4 ###############################################################################arch/frv/kernel/head-uc-fr451.S +2
-1@@ -9,6 +9,7 @@ * 2 of the License, or (at your option) any later version. */ +#include <linux/init.h> #include <linux/threads.h> #include <linux/linkage.h> #include <asm/ptrace.h>@@ -30,7 +31,7 @@ #define __400_LCR 0xfe000100 #define __400_LSBR 0xfe000c00 - .section .text.init,"ax" + __INIT .balign 4 ###############################################################################arch/frv/kernel/head-uc-fr555.S +2
-1@@ -9,6 +9,7 @@ * 2 of the License, or (at your option) any later version. */ +#include <linux/init.h> #include <linux/threads.h> #include <linux/linkage.h> #include <asm/ptrace.h>@@ -29,7 +30,7 @@ #define __551_LCR 0xfeff1100 #define __551_LSBR 0xfeff1c00 - .section .text.init,"ax" + __INIT .balign 4 ###############################################################################Signature · 1 line
1.6.2.1
Re: [PATCH 1/8] frv: Remove unused header asm/init.h.
In reply to Tim AbbottQuoted 3 lines · Tim Abbott
It seems nothing has included the frv
asm/init.hheader for some time, and its actual contents are out of date withinclude/linux/init.h. So just delete it.
git grep 'asm/init.h' agree with you.
Quoted 3 lines
Signed-off-by Tim Abbott <[email protected]>Cc David Howells <[email protected]>
Quoted 26 lines
--- arch/frv/include/asm/init.h | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) delete mode 100644 arch/frv/include/asm/init.harch/frv/include/asm/init.h deleted +0
-12@@ -1,12 +0,0 @@ -#ifndef _ASM_INIT_H -#define _ASM_INIT_H - -#define __init __attribute__ ((__section__ (".text.init"))) -#define __initdata __attribute__ ((__section__ (".data.init"))) -/* For assembly routines */ -#define __INIT .section ".text.init",#alloc,#execinstr -#define __FINIT .previous -#define __INITDATA .section ".data.init",#alloc,#write - -#endif -Signature · 1 line
1.6.2.1