[PATCH] arm64: Remove duplicate included header

Thorsten Blum posted 1 patch 1 year ago
arch/arm64/include/asm/seccomp.h | 1 -
1 file changed, 1 deletion(-)
[PATCH] arm64: Remove duplicate included header
Posted by Thorsten Blum 1 year ago
The header asm/unistd_compat_32.h is included whether CONFIG_COMPAT is
defined or not.

Include it only once and remove the following make includecheck warning:

  asm/unistd_compat_32.h is included more than once

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
 arch/arm64/include/asm/seccomp.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm64/include/asm/seccomp.h b/arch/arm64/include/asm/seccomp.h
index b83975555314..bf6bf40bc5ab 100644
--- a/arch/arm64/include/asm/seccomp.h
+++ b/arch/arm64/include/asm/seccomp.h
@@ -23,7 +23,6 @@
 #define SECCOMP_ARCH_NATIVE_NR		NR_syscalls
 #define SECCOMP_ARCH_NATIVE_NAME	"aarch64"
 #ifdef CONFIG_COMPAT
-#include <asm/unistd_compat_32.h>
 # define SECCOMP_ARCH_COMPAT		AUDIT_ARCH_ARM
 # define SECCOMP_ARCH_COMPAT_NR		__NR_compat32_syscalls
 # define SECCOMP_ARCH_COMPAT_NAME	"arm"
-- 
2.47.1
Re: [PATCH] arm64: Remove duplicate included header
Posted by Will Deacon 1 year ago
On Thu, 09 Jan 2025 11:46:34 +0100, Thorsten Blum wrote:
> The header asm/unistd_compat_32.h is included whether CONFIG_COMPAT is
> defined or not.
> 
> Include it only once and remove the following make includecheck warning:
> 
>   asm/unistd_compat_32.h is included more than once
> 
> [...]

Applied to arm64 (for-next/misc), thanks!

[1/1] arm64: Remove duplicate included header
      https://git.kernel.org/arm64/c/965e9bbe025e

Cheers,
-- 
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev
Re: [PATCH] arm64: Remove duplicate included header
Posted by Arnd Bergmann 1 year ago
On Thu, Jan 9, 2025, at 11:46, Thorsten Blum wrote:
> The header asm/unistd_compat_32.h is included whether CONFIG_COMPAT is
> defined or not.
>
> Include it only once and remove the following make includecheck warning:
>
>   asm/unistd_compat_32.h is included more than once
>
> Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>

Acked-by: Arnd Bergmann <arnd@arndb.de>