OSDN Git Service

arm64: remove pointless __KERNEL__ guards
authorMark Rutland <mark.rutland@arm.com>
Mon, 8 Jul 2019 16:36:40 +0000 (17:36 +0100)
committerWill Deacon <will@kernel.org>
Mon, 5 Aug 2019 10:06:33 +0000 (11:06 +0100)
commitb907b80d7ae7b2b65ef9f534f3e9a32ce6a4b539
tree189d595882344e00c12dbd22daee3c56263b04c8
parentc87857945b0e61c46222798b56fb1b0f4868088b
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>
16 files changed:
arch/arm64/include/asm/atomic.h
arch/arm64/include/asm/compat.h
arch/arm64/include/asm/debug-monitors.h
arch/arm64/include/asm/dma-mapping.h
arch/arm64/include/asm/fpsimd.h
arch/arm64/include/asm/futex.h
arch/arm64/include/asm/hw_breakpoint.h
arch/arm64/include/asm/io.h
arch/arm64/include/asm/irqflags.h
arch/arm64/include/asm/pci.h
arch/arm64/include/asm/proc-fns.h
arch/arm64/include/asm/processor.h
arch/arm64/include/asm/signal32.h
arch/arm64/include/asm/thread_info.h
arch/arm64/include/asm/vdso.h
arch/arm64/include/asm/vdso_datapage.h