Skip to content

Commit ae1f8d7

Browse files
arndbRussell King (Oracle)
authored andcommitted
ARM: 9304/1: add prototype for function called only from asm
When building with 'make W=1', the compiler warns about any function definition that does not come with a prototype in a header, to ensure it matches what the caller expects. This includes functions that are only ever caller from assembly code and don't technically need a declaration: arch/arm/kernel/ftrace.c:227:6: error: no previous prototype for 'prepare_ftrace_return' arch/arm/kernel/ptrace.c:850:16: error: no previous prototype for 'syscall_trace_enter' arch/arm/kernel/ptrace.c:878:17: error: no previous prototype for 'syscall_trace_exit' arch/arm/kernel/signal.c:601:1: error: no previous prototype for 'do_work_pending' arch/arm/kernel/signal.c:672:17: error: no previous prototype for 'do_rseq_syscall' arch/arm/kernel/suspend.c:75:6: error: no previous prototype for '__cpu_suspend_save' arch/arm/kernel/traps.c:451:17: error: no previous prototype for 'do_undefinstr' arch/arm/kernel/traps.c:516:39: error: no previous prototype for 'handle_fiq_as_nmi' arch/arm/kernel/traps.c:535:17: error: no previous prototype for 'bad_mode' arch/arm/kernel/traps.c:608:16: error: no previous prototype for 'arm_syscall' arch/arm/kernel/traps.c:734:1: error: no previous prototype for 'baddataabort' arch/arm/kernel/traps.c:774:17: error: no previous prototype for '__div0' arch/arm/kernel/traps.c:97:6: error: no previous prototype for 'dump_backtrace_stm' arch/arm/kernel/unwind.c:40:6: error: no previous prototype for '__aeabi_unwind_cpp_pr0' arch/arm/kernel/unwind.c:45:6: error: no previous prototype for '__aeabi_unwind_cpp_pr1' arch/arm/kernel/unwind.c:50:6: error: no previous prototype for '__aeabi_unwind_cpp_pr2' arch/arm/mm/fault.c:554:1: error: no previous prototype for 'do_DataAbort' arch/arm/mm/fault.c:584:1: error: no previous prototype for 'do_PrefetchAbort' arch/arm/mm/proc-v7-bugs.c:280:6: error: no previous prototype for 'cpu_v7_ca8_ibe' arch/arm/mm/proc-v7-bugs.c:293:6: error: no previous prototype for 'cpu_v7_bugs_init' arch/arm/vdso/vgettimeofday.c:36:6: error: no previous prototype for '__aeabi_unwind_cpp_pr0' arch/arm/vdso/vgettimeofday.c:40:6: error: no previous prototype for '__aeabi_unwind_cpp_pr1' arch/arm/vdso/vgettimeofday.c:44:6: error: no previous prototype for '__aeabi_unwind_cpp_pr2' arch/arm/vfp/vfpmodule.c:323:6: error: no previous prototype for 'VFP_bounce' Add the prototypes anyway, to allow enabling this warning by default in the future. Reviewed-by: Kees Cook <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Russell King (Oracle) <[email protected]>
1 parent 1b9c3dd commit ae1f8d7

File tree

9 files changed

+35
-0
lines changed

9 files changed

+35
-0
lines changed

arch/arm/include/asm/ftrace.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ static inline bool arch_syscall_match_sym_name(const char *sym,
7575
return !strcasecmp(sym, name);
7676
}
7777

78+
void prepare_ftrace_return(unsigned long *parent, unsigned long self,
79+
unsigned long frame_pointer,
80+
unsigned long stack_pointer);
81+
7882
#endif /* ifndef __ASSEMBLY__ */
7983

8084
#endif /* _ASM_ARM_FTRACE */

arch/arm/include/asm/ptrace.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,5 +193,8 @@ static inline unsigned long it_advance(unsigned long cpsr)
193193
return cpsr;
194194
}
195195

196+
int syscall_trace_enter(struct pt_regs *regs);
197+
void syscall_trace_exit(struct pt_regs *regs);
198+
196199
#endif /* __ASSEMBLY__ */
197200
#endif

arch/arm/include/asm/signal.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,9 @@ typedef struct {
2222
#define __ARCH_HAS_SA_RESTORER
2323

2424
#include <asm/sigcontext.h>
25+
26+
void do_rseq_syscall(struct pt_regs *regs);
27+
int do_work_pending(struct pt_regs *regs, unsigned int thread_flags,
28+
int syscall);
29+
2530
#endif

arch/arm/include/asm/spectre.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,8 @@ static inline void spectre_v2_update_state(unsigned int state,
3535

3636
int spectre_bhb_update_vectors(unsigned int method);
3737

38+
void cpu_v7_ca8_ibe(void);
39+
void cpu_v7_ca15_ibe(void);
40+
void cpu_v7_bugs_init(void);
41+
3842
#endif

arch/arm/include/asm/suspend.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ extern void cpu_resume(void);
1313
extern void cpu_resume_no_hyp(void);
1414
extern void cpu_resume_arm(void);
1515
extern int cpu_suspend(unsigned long, int (*)(unsigned long));
16+
extern void __cpu_suspend_save(u32 *ptr, u32 ptrsz, u32 sp, u32 *save_ptr);
1617

1718
#endif

arch/arm/include/asm/traps.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,13 @@ extern void ptrace_break(struct pt_regs *regs);
3535

3636
extern void *vectors_page;
3737

38+
asmlinkage void dump_backtrace_stm(u32 *stack, u32 instruction, const char *loglvl);
39+
asmlinkage void do_undefinstr(struct pt_regs *regs);
40+
asmlinkage void handle_fiq_as_nmi(struct pt_regs *regs);
41+
asmlinkage void bad_mode(struct pt_regs *regs, int reason);
42+
asmlinkage int arm_syscall(int no, struct pt_regs *regs);
43+
asmlinkage void baddataabort(int code, unsigned long instr, struct pt_regs *regs);
44+
asmlinkage void __div0(void);
45+
asmlinkage void handle_bad_stack(struct pt_regs *regs);
46+
3847
#endif

arch/arm/include/asm/unwind.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ extern void unwind_table_del(struct unwind_table *tab);
4040
extern void unwind_backtrace(struct pt_regs *regs, struct task_struct *tsk,
4141
const char *loglvl);
4242

43+
void __aeabi_unwind_cpp_pr0(void);
44+
void __aeabi_unwind_cpp_pr1(void);
45+
void __aeabi_unwind_cpp_pr2(void);
46+
4347
#endif /* !__ASSEMBLY__ */
4448

4549
#ifdef CONFIG_ARM_UNWIND

arch/arm/include/asm/vfp.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102

103103
#ifndef __ASSEMBLY__
104104
void vfp_disable(void);
105+
void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs);
105106
#endif
106107

107108
#endif /* __ASM_VFP_H */

arch/arm/mm/fault.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,9 @@ static inline int fsr_fs(unsigned int fsr)
3737

3838
void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
3939
void early_abt_enable(void);
40+
asmlinkage void do_DataAbort(unsigned long addr, unsigned int fsr,
41+
struct pt_regs *regs);
42+
asmlinkage void do_PrefetchAbort(unsigned long addr, unsigned int ifsr,
43+
struct pt_regs *regs);
4044

4145
#endif /* __ARCH_ARM_FAULT_H */

0 commit comments

Comments
 (0)