[ebtables PATCH] include: drop bundled copy of linux/types.h

[ebtables PATCH] include: drop bundled copy of linux/types.h

[Sebastien Bacher]

[-- Attachment #1.1: Type: text/plain, Size: 661 bytes --]

The bundled include/linux/types.h is a copy of the kernel UAPI header
from v3.16. Since the build uses -I./include, it shadows the system
<linux/types.h>.

Recent kernel UAPI headers (v7.3) changed arm64's asm/sigcontext.h,
included via <signal.h>, to use the __u128 type from linux/types.h:

  - __uint128_t vregs[32];
  + __u128 vregs[32];

The stale copy lacks __u128, so the build fails on arm64:

  /usr/include/aarch64-linux-gnu/asm/sigcontext.h:81:9: error: unknown
  type name '__u128'; did you mean '__u32'?

The system header provides everything the bundled copy did, so drop it.

Link: https://bugs.launchpad.net/ubuntu/+source/ebtables/+bug/2169809

[-- Attachment #1.2: Type: text/html, Size: 860 bytes --]

[-- Attachment #2: 0001-include-drop-bundled-copy-of-linux-types.h.patch --]
[-- Type: text/x-patch, Size: 2746 bytes --]

From b535caf076e21f2667b84aad9308dd4433f18017 Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Wed, 7 Oct 2026 12:39:13 +0200
Subject: [ebtables PATCH] include: drop bundled copy of linux/types.h

The bundled include/linux/types.h is a copy of the kernel UAPI header
from v3.16. Since the build uses -I./include, it shadows the system
<linux/types.h>.

Recent kernel UAPI headers (v7.3) changed arm64's asm/sigcontext.h,
included via <signal.h>, to use the __u128 type from linux/types.h:

  -	__uint128_t vregs[32];
  +	__u128 vregs[32];

The stale copy lacks __u128, so the build fails on arm64:

  /usr/include/aarch64-linux-gnu/asm/sigcontext.h:81:9: error: unknown
  type name '__u128'; did you mean '__u32'?

The system header provides everything the bundled copy did, so drop it.

Link: https://bugs.launchpad.net/ubuntu/+source/ebtables/+bug/2169809
Signed-off-by: Sebastien Bacher <seb128@ubuntu.com>
---
 include/linux/types.h | 51 -------------------------------------------
 1 file changed, 51 deletions(-)
 delete mode 100644 include/linux/types.h

diff --git a/include/linux/types.h b/include/linux/types.h
deleted file mode 100644
index 23ea78f..0000000
--- a/include/linux/types.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef _LINUX_TYPES_H
-#define _LINUX_TYPES_H
-
-#include <asm/types.h>
-
-#ifndef __ASSEMBLY__
-
-#include <linux/posix_types.h>
-
-
-/*
- * Below are truly Linux-specific types that should never collide with
- * any application/library that wants linux/types.h.
- */
-
-#ifdef __CHECKER__
-#define __bitwise__ __attribute__((bitwise))
-#else
-#define __bitwise__
-#endif
-#ifdef __CHECK_ENDIAN__
-#define __bitwise __bitwise__
-#else
-#define __bitwise
-#endif
-
-typedef __u16 __bitwise __le16;
-typedef __u16 __bitwise __be16;
-typedef __u32 __bitwise __le32;
-typedef __u32 __bitwise __be32;
-typedef __u64 __bitwise __le64;
-typedef __u64 __bitwise __be64;
-
-typedef __u16 __bitwise __sum16;
-typedef __u32 __bitwise __wsum;
-
-/*
- * aligned_u64 should be used in defining kernel<->userspace ABIs to avoid
- * common 32/64-bit compat problems.
- * 64-bit values align to 4-byte boundaries on x86_32 (and possibly other
- * architectures) and to 8-byte boundaries on 64-bit architectures.  The new
- * aligned_64 type enforces 8-byte alignment so that structs containing
- * aligned_64 values have the same alignment on 32-bit and 64-bit architectures.
- * No conversions are necessary between 32-bit user-space and a 64-bit kernel.
- */
-#define __aligned_u64 __u64 __attribute__((aligned(8)))
-#define __aligned_be64 __be64 __attribute__((aligned(8)))
-#define __aligned_le64 __le64 __attribute__((aligned(8)))
-
-#endif /*  __ASSEMBLY__ */
-#endif /* _LINUX_TYPES_H */
-- 
2.43.0

Re: [ebtables PATCH] include: drop bundled copy of linux/types.h

[Florian Westphal]

Sebastien Bacher <sebastien.bacher@canonical.com> wrote:
> The bundled include/linux/types.h is a copy of the kernel UAPI header
> from v3.16. Since the build uses -I./include, it shadows the system
> <linux/types.h>.
> 
> Recent kernel UAPI headers (v7.3) changed arm64's asm/sigcontext.h,
> included via <signal.h>, to use the __u128 type from linux/types.h:
> 
>   - __uint128_t vregs[32];
>   + __u128 vregs[32];
> 
> The stale copy lacks __u128, so the build fails on arm64:
> 
>   /usr/include/aarch64-linux-gnu/asm/sigcontext.h:81:9: error: unknown
>   type name '__u128'; did you mean '__u32'?
> 
> The system header provides everything the bundled copy did, so drop it.

Applied, thanks.