Recent refactoring have made the header empty. Remove it and its mentions.
Also that header was never a real asm-generic header anyways. It had no reason to be in the asm-generic directory. Signed-off-by: Thomas Weißschuh <[email protected]> --- MAINTAINERS | 1 - arch/arm/include/asm/vdso/vsyscall.h | 3 --- arch/arm64/include/asm/vdso/vsyscall.h | 3 --- arch/loongarch/include/asm/vdso/vsyscall.h | 3 --- arch/mips/include/asm/vdso/vsyscall.h | 3 --- arch/powerpc/include/asm/vdso/vsyscall.h | 3 --- arch/riscv/include/asm/vdso/vsyscall.h | 3 --- arch/s390/include/asm/vdso/vsyscall.h | 3 --- arch/sparc/include/asm/vdso/vsyscall.h | 2 -- arch/x86/include/asm/vdso/vsyscall.h | 3 --- include/asm-generic/vdso/vsyscall.h | 10 ---------- 11 files changed, 37 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 562ace172594..21c590dd28b6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11064,7 +11064,6 @@ M: Vincenzo Frascino <[email protected]> L: [email protected] S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/vdso -F: include/asm-generic/vdso/vsyscall.h F: include/linux/vdso_datastore.h F: include/linux/vdso_time.h F: include/vdso/ diff --git a/arch/arm/include/asm/vdso/vsyscall.h b/arch/arm/include/asm/vdso/vsyscall.h index ff1c729af05f..14f2ea9d8640 100644 --- a/arch/arm/include/asm/vdso/vsyscall.h +++ b/arch/arm/include/asm/vdso/vsyscall.h @@ -14,9 +14,6 @@ void __arch_sync_vdso_time_data(struct vdso_time_data *vdata) } #define __arch_sync_vdso_time_data __arch_sync_vdso_time_data -/* The asm-generic header needs to be included after the definitions above */ -#include <asm-generic/vdso/vsyscall.h> - #endif /* !__ASSEMBLY__ */ #endif /* __ASM_VDSO_VSYSCALL_H */ diff --git a/arch/arm64/include/asm/vdso/vsyscall.h b/arch/arm64/include/asm/vdso/vsyscall.h index 3f3c8eb74e2e..7d9d6bdd58b2 100644 --- a/arch/arm64/include/asm/vdso/vsyscall.h +++ b/arch/arm64/include/asm/vdso/vsyscall.h @@ -19,9 +19,6 @@ void __arch_update_vdso_clock(struct vdso_clock *vc) } #define __arch_update_vdso_clock __arch_update_vdso_clock -/* The asm-generic header needs to be included after the definitions above */ -#include <asm-generic/vdso/vsyscall.h> - #endif /* !__ASSEMBLER__ */ #endif /* __ASM_VDSO_VSYSCALL_H */ diff --git a/arch/loongarch/include/asm/vdso/vsyscall.h b/arch/loongarch/include/asm/vdso/vsyscall.h index 558eb9dfda52..db653780519d 100644 --- a/arch/loongarch/include/asm/vdso/vsyscall.h +++ b/arch/loongarch/include/asm/vdso/vsyscall.h @@ -6,9 +6,6 @@ #include <vdso/datapage.h> -/* The asm-generic header needs to be included after the definitions above */ -#include <asm-generic/vdso/vsyscall.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 index 0f061a9babd1..f01ab2e15c08 100644 --- a/arch/mips/include/asm/vdso/vsyscall.h +++ b/arch/mips/include/asm/vdso/vsyscall.h @@ -8,9 +8,6 @@ #include <vdso/datapage.h> -/* The asm-generic header needs to be included after the definitions above */ -#include <asm-generic/vdso/vsyscall.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 index bee18e8660a0..6a6510fa8217 100644 --- a/arch/powerpc/include/asm/vdso/vsyscall.h +++ b/arch/powerpc/include/asm/vdso/vsyscall.h @@ -6,9 +6,6 @@ #include <asm/vdso_datapage.h> -/* The asm-generic header needs to be included after the definitions above */ -#include <asm-generic/vdso/vsyscall.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 index 558eb9dfda52..db653780519d 100644 --- a/arch/riscv/include/asm/vdso/vsyscall.h +++ b/arch/riscv/include/asm/vdso/vsyscall.h @@ -6,9 +6,6 @@ #include <vdso/datapage.h> -/* The asm-generic header needs to be included after the definitions above */ -#include <asm-generic/vdso/vsyscall.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 index b00acec8ddbc..c74c307c320c 100644 --- a/arch/s390/include/asm/vdso/vsyscall.h +++ b/arch/s390/include/asm/vdso/vsyscall.h @@ -8,9 +8,6 @@ #include <vdso/datapage.h> #include <asm/vdso.h> -/* The asm-generic header needs to be included after the definitions above */ -#include <asm-generic/vdso/vsyscall.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 index 8bfe703fedc5..b08e0bd5e309 100644 --- a/arch/sparc/include/asm/vdso/vsyscall.h +++ b/arch/sparc/include/asm/vdso/vsyscall.h @@ -5,6 +5,4 @@ #define __VDSO_PAGES 4 -#include <asm-generic/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 index 4aa311a923f2..57598db8763b 100644 --- a/arch/x86/include/asm/vdso/vsyscall.h +++ b/arch/x86/include/asm/vdso/vsyscall.h @@ -14,9 +14,6 @@ #include <vdso/datapage.h> #include <asm/vgtod.h> -/* The asm-generic header needs to be included after the definitions above */ -#include <asm-generic/vdso/vsyscall.h> - #endif /* !__ASSEMBLER__ */ #endif /* __ASM_VDSO_VSYSCALL_H */ diff --git a/include/asm-generic/vdso/vsyscall.h b/include/asm-generic/vdso/vsyscall.h deleted file mode 100644 index cfb740e82cb5..000000000000 --- a/include/asm-generic/vdso/vsyscall.h +++ /dev/null @@ -1,10 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __ASM_GENERIC_VSYSCALL_H -#define __ASM_GENERIC_VSYSCALL_H - -#ifndef __ASSEMBLER__ - - -#endif /* !__ASSEMBLER__ */ - -#endif /* __ASM_GENERIC_VSYSCALL_H */ -- 2.55.0
