ARM: Do not use__init annotations to declarations
PATCH 1/1 ARM: Do not use__init annotations to declarations
According to Russell King (https://lkml.org/lkml/2011/4/5/323), __init should not be used in function declarations.
Signed-off-by Fabio Estevam <[email protected]>
--- arch/arm/include/asm/hardware/cache-l2x0.h | 2 +- arch/arm/include/asm/hardware/cache-tauros2.h | 2 +- arch/arm/include/asm/kprobes.h | 2 +- arch/arm/include/asm/traps.h | 2 +- arch/arm/include/asm/unwind.h | 4 ++-- arch/arm/kernel/tcm.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/include/asm/hardware/cache-l2x0.h +1 -1
@@ -73,7 +73,7 @@#define L2X0_AUX_CTRL_EARLY_BRESP_SHIFT 30#ifndef __ASSEMBLY__ -extern void __init l2x0_init (void __iomem *base,__u32 aux_val,__u32 aux_mask); +extern void l2x0_init (void __iomem *base,__u32 aux_val,__u32 aux_mask);#endif #endif
arch/arm/include/asm/hardware/cache-tauros2.h +1 -1
@@ -8,4 +8,4 @@* warranty of any kind, whether express or implied. */ -extern void __init tauros2_init (void ); +extern void tauros2_init (void );
arch/arm/include/asm/kprobes.h +1 -1
@@ -73,6 +73,6 @@ enum kprobe_insn {enum kprobe_insn arm_kprobe_decode_insn (kprobe_opcode_t ,struct arch_specific_insn *); -void __init arm_kprobe_decode_init (void ); +void arm_kprobe_decode_init (void );#endif /* _ARM_KPROBES_H */
arch/arm/include/asm/traps.h +1 -1
@@ -43,7 +43,7 @@ static inline int in_exception_text(unsigned long ptr)return in ? :__in_irqentry_text (ptr); } -extern void __init early_trap_init (void ); +extern void early_trap_init (void );extern void dump_backtrace_entry (unsigned long where,unsigned long from,unsigned long frame);extern void ptrace_break (struct task_struct *tsk,struct pt_regs *regs);
arch/arm/include/asm/unwind.h +2 -2
@@ -50,9 +50,9 @@ extern void unwind_table_del(struct unwind_table *tab);extern void unwind_backtrace (struct pt_regs *regs,struct task_struct *tsk);#ifdef CONFIG_ARM_UNWIND -extern int __init unwind_init (void ); +extern int unwind_init (void );#else -static inline int __init unwind_init (void ) +static inline int unwind_init (void ) {return 0 ; }
arch/arm/kernel/tcm.h +1 -1
@@ -8,7 +8,7 @@*/ #ifdef CONFIG_HAVE_TCM -void __init tcm_init (void ); +void tcm_init (void );#else /* No TCM support, just blank inlines to be optimized out */ inline void tcm_init (void )
Signature · 1 line
1.6.0.4
PATCH 1/1 ARM: Do not use__init annotations to declarations
Hi Russell,
Quoted 82 lines · Fabio Estevam
According to Russell King (https://lkml.org/lkml/2011/4/5/323),
__initshould not be used in function declarations.Signed-off-by Fabio Estevam <[email protected]>--- arch/arm/include/asm/hardware/cache-l2x0.h | 2 +- arch/arm/include/asm/hardware/cache-tauros2.h | 2 +- arch/arm/include/asm/kprobes.h | 2 +- arch/arm/include/asm/traps.h | 2 +- arch/arm/include/asm/unwind.h | 4 ++-- arch/arm/kernel/tcm.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-)arch/arm/include/asm/hardware/cache-l2x0.h +1
-1@@ -73,7 +73,7 @@#define L2X0_AUX_CTRL_EARLY_BRESP_SHIFT 30#ifndef __ASSEMBLY__ -extern void __init l2x0_init (void __iomem *base,__u32 aux_val,__u32 aux_mask); +extern void l2x0_init (void __iomem *base,__u32 aux_val,__u32 aux_mask);#endif #endif arch/arm/include/asm/hardware/cache-tauros2.h +1
-1@@ -8,4 +8,4 @@* warranty of any kind, whether express or implied. */ -extern void __init tauros2_init (void ); +extern void tauros2_init (void );arch/arm/include/asm/kprobes.h +1
-1@@ -73,6 +73,6 @@ enum kprobe_insn {enum kprobe_insn arm_kprobe_decode_insn (kprobe_opcode_t ,struct arch_specific_insn *); -void __init arm_kprobe_decode_init (void ); +void arm_kprobe_decode_init (void );#endif /* _ARM_KPROBES_H */ arch/arm/include/asm/traps.h +1
-1@@ -43,7 +43,7 @@ static inline int in_exception_text(unsigned long ptr)return in ? :__in_irqentry_text (ptr); } -extern void __init early_trap_init (void ); +extern void early_trap_init (void );extern void dump_backtrace_entry (unsigned long where,unsigned long from,unsigned long frame);extern void ptrace_break (struct task_struct *tsk,struct pt_regs *regs);arch/arm/include/asm/unwind.h +2
-2@@ -50,9 +50,9 @@ extern void unwind_table_del(struct unwind_table *tab);extern void unwind_backtrace (struct pt_regs *regs,struct task_struct *tsk);#ifdef CONFIG_ARM_UNWIND -extern int __init unwind_init (void ); +extern int unwind_init (void );#else -static inline int __init unwind_init (void ) +static inline int unwind_init (void ) {return 0 ; }arch/arm/kernel/tcm.h +0
-0
arch/arm/kernel/tcm.h line 14
Quoted 8 lines
arch/arm/kernel/tcm.h +1
-1@@ -8,7 +8,7 @@*/ #ifdef CONFIG_HAVE_TCM -void __init tcm_init (void ); +void tcm_init (void );#else /* No TCM support, just blank inlines to be optimized out */ inline void tcm_init (void )
Is this patch OK?
Regards,
Fabio Estevam
PATCH 1/1 ARM: Do not use__init annotations to declarations
Quoted 1 line · Fabio Estevam
Is this patch OK?
Patch is fine as far as it goes. However, with the current focus on the amount of churn in the ARM tree, I'm debating whether or not to take this, or wait until these files get touched by some other patch first.