Skip to content

Commit a12f858

Browse files
arndbRussell King (Oracle)
authored andcommitted
ARM: 9313/1: vdso: add missing prototypes
The __vdso_clock_* functions have no prototype, and the __eabi_unwind_cpp_pr* functions have a prototype in a header that is not included before the definition: arch/arm/vdso/vgettimeofday.c:10:5: error: no previous prototype for '__vdso_clock_gettime' [-Werror=missing-prototypes] arch/arm/vdso/vgettimeofday.c:16:5: error: no previous prototype for '__vdso_clock_gettime64' [-Werror=missing-prototypes] arch/arm/vdso/vgettimeofday.c:22:5: error: no previous prototype for '__vdso_gettimeofday' [-Werror=missing-prototypes] arch/arm/vdso/vgettimeofday.c:28:5: error: no previous prototype for '__vdso_clock_getres' [-Werror=missing-prototypes] arch/arm/vdso/vgettimeofday.c:36:6: error: no previous prototype for '__aeabi_unwind_cpp_pr0' [-Werror=missing-prototypes] arch/arm/vdso/vgettimeofday.c:40:6: error: no previous prototype for '__aeabi_unwind_cpp_pr1' [-Werror=missing-prototypes] arch/arm/vdso/vgettimeofday.c:44:6: error: no previous prototype for '__aeabi_unwind_cpp_pr2' [-Werror=missing-prototypes] Add the prototypes in an appropriate header and ensure that both are included here. Reviewed-by: Kees Cook <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Russell King (Oracle) <[email protected]>
1 parent 2332c61 commit a12f858

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

arch/arm/include/asm/vdso.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ static inline void arm_install_vdso(struct mm_struct *mm, unsigned long addr)
2424

2525
#endif /* CONFIG_VDSO */
2626

27+
int __vdso_clock_gettime(clockid_t clock, struct old_timespec32 *ts);
28+
int __vdso_clock_gettime64(clockid_t clock, struct __kernel_timespec *ts);
29+
int __vdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz);
30+
int __vdso_clock_getres(clockid_t clock_id, struct old_timespec32 *res);
31+
2732
#endif /* __ASSEMBLY__ */
2833

2934
#endif /* __KERNEL__ */

arch/arm/vdso/vgettimeofday.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
*/
77
#include <linux/time.h>
88
#include <linux/types.h>
9+
#include <asm/vdso.h>
10+
#include <asm/unwind.h>
911

1012
int __vdso_clock_gettime(clockid_t clock,
1113
struct old_timespec32 *ts)

0 commit comments

Comments
 (0)