Commit-ID: ed75e8f60bb1d41d751ccad470e15bc2a57adee6 Gitweb: https://git.kernel.org/tip/ed75e8f60bb1d41d751ccad470e15bc2a57adee6 Author: Catalin Marinas <catalin.marinas@xxxxxxx> AuthorDate: Mon, 24 Jun 2019 14:56:24 +0100 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitDate: Wed, 26 Jun 2019 07:28:09 +0200 vdso: Remove superfluous #ifdef __KERNEL__ in vdso/datapage.h With the move to UAPI headers, such #ifdefs are no longer necessary. Fixes: 361f8aee9b09 ("vdso: Define standardized vdso_datapage") Signed-off-by: Catalin Marinas <catalin.marinas@xxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Vincenzo Frascino <vincenzo.frascino@xxxxxxx> Cc: linux-arch@xxxxxxxxxxxxxxx Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx Cc: linux-mips@xxxxxxxxxxxxxxx Cc: linux-kselftest@xxxxxxxxxxxxxxx Cc: Will Deacon <will.deacon@xxxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Cc: Russell King <linux@xxxxxxxxxxxxxxx> Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Cc: Paul Burton <paul.burton@xxxxxxxx> Cc: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> Cc: Mark Salyzyn <salyzyn@xxxxxxxxxxx> Cc: Peter Collingbourne <pcc@xxxxxxxxxx> Cc: Shuah Khan <shuah@xxxxxxxxxx> Cc: Dmitry Safonov <0x7f454c46@xxxxxxxxx> Cc: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx> Cc: Huw Davies <huw@xxxxxxxxxxxxxxx> Cc: Shijith Thotton <sthotton@xxxxxxxxxxx> Cc: Andre Przywara <andre.przywara@xxxxxxx> Link: https://lkml.kernel.org/r/20190624135624.GB29120@xxxxxxxxxxxxxxxxxxxx --- include/vdso/datapage.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/vdso/datapage.h b/include/vdso/datapage.h index e6eb36c3d54f..2e302c0f41f7 100644 --- a/include/vdso/datapage.h +++ b/include/vdso/datapage.h @@ -2,8 +2,6 @@ #ifndef __VDSO_DATAPAGE_H #define __VDSO_DATAPAGE_H -#ifdef __KERNEL__ - #ifndef __ASSEMBLY__ #include <linux/bits.h> @@ -88,6 +86,4 @@ extern struct vdso_data _vdso_data[CS_BASES] __attribute__((visibility("hidden") #endif /* !__ASSEMBLY__ */ -#endif /* __KERNEL__ */ - #endif /* __VDSO_DATAPAGE_H */
![]() |