Merge branch 'for-next/uapi' into for-next/core

* for-next/uapi:
  arm64: uapi: Use __u128 instead of __uint128_t in UAPI headers
  tools: linux/types.h: Add 128-bit integer types for arm64 UAPI structures
This commit is contained in:
Will Deacon
2026-08-14 10:16:13 +00:00
3 changed files with 14 additions and 9 deletions

View File

@@ -93,7 +93,7 @@ struct user_pt_regs {
};
struct user_fpsimd_state {
__uint128_t vregs[32];
__u128 vregs[32];
__u32 fpsr;
__u32 fpcr;
__u32 __reserved[2];
@@ -258,14 +258,14 @@ struct user_pac_mask {
/* pointer authentication keys (NT_ARM_PACA_KEYS, NT_ARM_PACG_KEYS) */
struct user_pac_address_keys {
__uint128_t apiakey;
__uint128_t apibkey;
__uint128_t apdakey;
__uint128_t apdbkey;
__u128 apiakey;
__u128 apibkey;
__u128 apdakey;
__u128 apdbkey;
};
struct user_pac_generic_keys {
__uint128_t apgakey;
__u128 apgakey;
};
/* ZA state (NT_ARM_ZA) */

View File

@@ -78,7 +78,7 @@ struct fpsimd_context {
struct _aarch64_ctx head;
__u32 fpsr;
__u32 fpcr;
__uint128_t vregs[32];
__u128 vregs[32];
};
/*
@@ -266,8 +266,8 @@ struct gcs_context {
* - ---- -----------
* REGS the entire SVE context
*
* ZREGS __uint128_t[SVE_NUM_ZREGS][vq] all Z-registers
* ZREG __uint128_t[vq] individual Z-register Zn
* ZREGS __u128[SVE_NUM_ZREGS][vq] all Z-registers
* ZREG __u128[vq] individual Z-register Zn
*
* PREGS uint16_t[SVE_NUM_PREGS][vq] all P-registers
* PREG uint16_t[vq] individual P-register Pn

View File

@@ -23,6 +23,11 @@ typedef enum {
__GFP_HIGH
} gfp_t;
#ifdef __SIZEOF_INT128__
typedef __signed__ __int128 __s128 __attribute__((aligned(16)));
typedef unsigned __int128 __u128 __attribute__((aligned(16)));
#endif
/*
* We define u64 as uint64_t for every architecture
* so that we can print it with "%"PRIx64 without getting warnings.