Most architectures' asm/vdso/vsyscall.h do not define any symbols. Add an empty asm-generic variant and replace the pointless architecture-specific copies.
Signed-off-by: Thomas Weißschuh <[email protected]> --- arch/loongarch/include/asm/vdso/vsyscall.h | 11 ----------- arch/mips/include/asm/vdso/vsyscall.h | 13 ------------- arch/powerpc/include/asm/vdso/vsyscall.h | 11 ----------- arch/riscv/include/asm/vdso/vsyscall.h | 11 ----------- arch/s390/include/asm/vdso/vsyscall.h | 13 ------------- arch/sparc/include/asm/vdso/vsyscall.h | 6 ------ arch/x86/include/asm/vdso/vsyscall.h | 12 ------------ include/asm-generic/Kbuild | 1 + include/asm-generic/vdso/vsyscall.h | 0 9 files changed, 1 insertion(+), 77 deletions(-) diff --git a/arch/loongarch/include/asm/vdso/vsyscall.h b/arch/loongarch/include/asm/vdso/vsyscall.h deleted file mode 100644 index db653780519d..000000000000 --- a/arch/loongarch/include/asm/vdso/vsyscall.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __ASM_VDSO_VSYSCALL_H -#define __ASM_VDSO_VSYSCALL_H - -#ifndef __ASSEMBLER__ - -#include <vdso/datapage.h> - -#endif /* !__ASSEMBLER__ */ - -#endif /* __ASM_VDSO_VSYSCALL_H */ diff --git a/arch/mips/include/asm/vdso/vsyscall.h b/arch/mips/include/asm/vdso/vsyscall.h deleted file mode 100644 index f01ab2e15c08..000000000000 --- a/arch/mips/include/asm/vdso/vsyscall.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __ASM_VDSO_VSYSCALL_H -#define __ASM_VDSO_VSYSCALL_H - -#include <asm/page.h> - -#ifndef __ASSEMBLER__ - -#include <vdso/datapage.h> - -#endif /* !__ASSEMBLER__ */ - -#endif /* __ASM_VDSO_VSYSCALL_H */ diff --git a/arch/powerpc/include/asm/vdso/vsyscall.h b/arch/powerpc/include/asm/vdso/vsyscall.h deleted file mode 100644 index 6a6510fa8217..000000000000 --- a/arch/powerpc/include/asm/vdso/vsyscall.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_POWERPC_VDSO_VSYSCALL_H -#define _ASM_POWERPC_VDSO_VSYSCALL_H - -#ifndef __ASSEMBLER__ - -#include <asm/vdso_datapage.h> - -#endif /* !__ASSEMBLER__ */ - -#endif /* _ASM_POWERPC_VDSO_VSYSCALL_H */ diff --git a/arch/riscv/include/asm/vdso/vsyscall.h b/arch/riscv/include/asm/vdso/vsyscall.h deleted file mode 100644 index db653780519d..000000000000 --- a/arch/riscv/include/asm/vdso/vsyscall.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __ASM_VDSO_VSYSCALL_H -#define __ASM_VDSO_VSYSCALL_H - -#ifndef __ASSEMBLER__ - -#include <vdso/datapage.h> - -#endif /* !__ASSEMBLER__ */ - -#endif /* __ASM_VDSO_VSYSCALL_H */ diff --git a/arch/s390/include/asm/vdso/vsyscall.h b/arch/s390/include/asm/vdso/vsyscall.h deleted file mode 100644 index c74c307c320c..000000000000 --- a/arch/s390/include/asm/vdso/vsyscall.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __ASM_VDSO_VSYSCALL_H -#define __ASM_VDSO_VSYSCALL_H - -#ifndef __ASSEMBLER__ - -#include <linux/hrtimer.h> -#include <vdso/datapage.h> -#include <asm/vdso.h> - -#endif /* !__ASSEMBLER__ */ - -#endif /* __ASM_VDSO_VSYSCALL_H */ diff --git a/arch/sparc/include/asm/vdso/vsyscall.h b/arch/sparc/include/asm/vdso/vsyscall.h deleted file mode 100644 index ff62b291e4eb..000000000000 --- a/arch/sparc/include/asm/vdso/vsyscall.h +++ /dev/null @@ -1,6 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ - -#ifndef _ASM_SPARC_VDSO_VSYSCALL_H -#define _ASM_SPARC_VDSO_VSYSCALL_H - -#endif /* _ASM_SPARC_VDSO_VSYSCALL_H */ diff --git a/arch/x86/include/asm/vdso/vsyscall.h b/arch/x86/include/asm/vdso/vsyscall.h deleted file mode 100644 index 65d10f4cc718..000000000000 --- a/arch/x86/include/asm/vdso/vsyscall.h +++ /dev/null @@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __ASM_VDSO_VSYSCALL_H -#define __ASM_VDSO_VSYSCALL_H - -#ifndef __ASSEMBLER__ - -#include <vdso/datapage.h> -#include <asm/vgtod.h> - -#endif /* !__ASSEMBLER__ */ - -#endif /* __ASM_VDSO_VSYSCALL_H */ diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild index 2bc00c67dc54..b7a388bef6ea 100644 --- a/include/asm-generic/Kbuild +++ b/include/asm-generic/Kbuild @@ -63,6 +63,7 @@ mandatory-y += trace_clock.h mandatory-y += uaccess.h mandatory-y += unwind_user.h mandatory-y += vdso/clocksource.h +mandatory-y += vdso/vsyscall.h mandatory-y += vermagic.h mandatory-y += vga.h mandatory-y += video.h diff --git a/include/asm-generic/vdso/vsyscall.h b/include/asm-generic/vdso/vsyscall.h new file mode 100644 index 000000000000..e69de29bb2d1 -- 2.55.0
