diff options
author | Mark Rutland <mark.rutland@arm.com> | 2019-07-08 17:36:40 +0100 |
---|---|---|
committer | Will Deacon <will@kernel.org> | 2019-08-05 11:06:33 +0100 |
commit | b907b80d7ae7b2b65ef9f534f3e9a32ce6a4b539 (patch) | |
tree | 189d595882344e00c12dbd22daee3c56263b04c8 /arch/arm64/include/asm/hw_breakpoint.h | |
parent | c87857945b0e61c46222798b56fb1b0f4868088b (diff) | |
download | linux-b907b80d7ae7b2b65ef9f534f3e9a32ce6a4b539.tar.gz |
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/hw_breakpoint.h')
-rw-r--r-- | arch/arm64/include/asm/hw_breakpoint.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm64/include/asm/hw_breakpoint.h b/arch/arm64/include/asm/hw_breakpoint.h index db9ab760e6fd..bc7aaed4b34e 100644 --- a/arch/arm64/include/asm/hw_breakpoint.h +++ b/arch/arm64/include/asm/hw_breakpoint.h @@ -10,8 +10,6 @@ #include <asm/sysreg.h> #include <asm/virt.h> -#ifdef __KERNEL__ - struct arch_hw_breakpoint_ctrl { u32 __reserved : 19, len : 8, @@ -156,5 +154,4 @@ static inline int get_num_wrps(void) ID_AA64DFR0_WRPS_SHIFT); } -#endif /* __KERNEL__ */ #endif /* __ASM_BREAKPOINT_H */ |