diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-11-28 18:25:37 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-11-28 18:25:37 +0100 |
| commit | 0734f5c7eb15f9d3bbdacffe501eabdb8b1c01d2 (patch) | |
| tree | f166bc0686fd6b6376f81885c9d9f7288f86f7d8 /arch/arm/include | |
| parent | d67a308ac5de5b24b678ee90759a3b2e4283c11e (diff) | |
| parent | 7192ad2adde8213ad7c7f3b1ff974cccebae4d60 (diff) | |
| download | lwn-0734f5c7eb15f9d3bbdacffe501eabdb8b1c01d2.tar.gz lwn-0734f5c7eb15f9d3bbdacffe501eabdb8b1c01d2.zip | |
Merge branch 'asm-generic-prototypes' into asm-generic
As part of my quest to enable -Wmissing-prototypes by default,
these patches clean up some of the prototypes that are needed by all
architectures but are handled inconsistently.
The duplicate prototypes are moved into common code, which helps both
to clean up the existing warnings and simplifies the logic.
* asm-generic-prototypes:
arm64: vdso32: Define BUILD_VDSO32_64 to correct prototypes
csky: fix arch_jump_label_transform_static override
arch: add do_page_fault prototypes
arch: add missing prepare_ftrace_return() prototypes
arch: vdso: consolidate gettime prototypes
arch: include linux/cpu.h for trap_init() prototype
arch: fix asm-offsets.c building with -Wmissing-prototypes
arch: consolidate arch_irq_work_raise prototypes
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/irq_work.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/vdso.h | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/include/asm/irq_work.h b/arch/arm/include/asm/irq_work.h index 3149e4dc1b54..8895999834cc 100644 --- a/arch/arm/include/asm/irq_work.h +++ b/arch/arm/include/asm/irq_work.h @@ -9,6 +9,4 @@ static inline bool arch_irq_work_has_interrupt(void) return is_smp(); } -extern void arch_irq_work_raise(void); - #endif /* _ASM_ARM_IRQ_WORK_H */ diff --git a/arch/arm/include/asm/vdso.h b/arch/arm/include/asm/vdso.h index 422c3afa806a..5b85889f82ee 100644 --- a/arch/arm/include/asm/vdso.h +++ b/arch/arm/include/asm/vdso.h @@ -24,11 +24,6 @@ static inline void arm_install_vdso(struct mm_struct *mm, unsigned long addr) #endif /* CONFIG_VDSO */ -int __vdso_clock_gettime(clockid_t clock, struct old_timespec32 *ts); -int __vdso_clock_gettime64(clockid_t clock, struct __kernel_timespec *ts); -int __vdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz); -int __vdso_clock_getres(clockid_t clock_id, struct old_timespec32 *res); - #endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */ |