diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2019-07-08 18:36:40 +0200 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2019-08-05 12:06:33 +0200 |
| commit | b907b80d7ae7b2b65ef9f534f3e9a32ce6a4b539 (patch) | |
| tree | 189d595882344e00c12dbd22daee3c56263b04c8 /arch/arm64/include/asm/vdso.h | |
| parent | arm64: Remove unused assembly macro (diff) | |
| download | linux-b907b80d7ae7b2b65ef9f534f3e9a32ce6a4b539.tar.xz linux-b907b80d7ae7b2b65ef9f534f3e9a32ce6a4b539.zip | |
arm64: remove pointless __KERNEL__ guards
For a number of years, UAPI headers have been split from kernel-internal
headers. The latter are never exposed to userspace, and always built
with __KERNEL__ defined.
Most headers under arch/arm64 don't have __KERNEL__ guards, but there
are a few stragglers lying around. To make things more consistent, and
to set a good example going forward, let's remove these redundant
__KERNEL__ guards.
In a couple of cases, a trailing #endif lacked a comment describing its
corresponding #if or #ifdef, so these are fixes up at the same time.
Guards in auto-generated crypto code are left as-is, as these guards are
generated by scripting imported from the upstream openssl project
scripts. Guards in UAPI headers are left as-is, as these can be included
by userspace or the kernel.
There should be no functional change as a result of this patch.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm/vdso.h')
| -rw-r--r-- | arch/arm64/include/asm/vdso.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm64/include/asm/vdso.h b/arch/arm64/include/asm/vdso.h index 9c15e0a06301..07468428fd29 100644 --- a/arch/arm64/include/asm/vdso.h +++ b/arch/arm64/include/asm/vdso.h @@ -5,8 +5,6 @@ #ifndef __ASM_VDSO_H #define __ASM_VDSO_H -#ifdef __KERNEL__ - /* * Default link address for the vDSO. * Since we randomise the VDSO mapping, there's little point in trying @@ -28,6 +26,4 @@ #endif /* !__ASSEMBLY__ */ -#endif /* __KERNEL__ */ - #endif /* __ASM_VDSO_H */ |