diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2022-12-20 15:02:03 -0800 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2022-12-20 15:02:03 -0800 |
| commit | 1644d755d0b06d0f1ee93e1c44336c29386546b4 (patch) | |
| tree | 58f4fb795fed3f4b2c1cb6bbac9ed25b3134d390 /include/uapi | |
| parent | b29e6ece454f7f4822b40441da393c3969c312b3 (diff) | |
| parent | b6bb9676f2165d518b35ba3bea5f1fcfc0d969bf (diff) | |
Merge branch 'linus'
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/asm-generic/types.h | 6 | ||||
| -rw-r--r-- | include/uapi/linux/idxd.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/swab.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/uapi/asm-generic/types.h b/include/uapi/asm-generic/types.h index dfaa50d99d8f..7ad4dd01b8bf 100644 --- a/include/uapi/asm-generic/types.h +++ b/include/uapi/asm-generic/types.h @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef _ASM_GENERIC_TYPES_H -#define _ASM_GENERIC_TYPES_H +#ifndef _UAPI_ASM_GENERIC_TYPES_H +#define _UAPI_ASM_GENERIC_TYPES_H /* * int-ll64 is used everywhere now. */ #include <asm-generic/int-ll64.h> -#endif /* _ASM_GENERIC_TYPES_H */ +#endif /* _UAPI_ASM_GENERIC_TYPES_H */ diff --git a/include/uapi/linux/idxd.h b/include/uapi/linux/idxd.h index 2b9e7feba3f3..1d553bedbdb5 100644 --- a/include/uapi/linux/idxd.h +++ b/include/uapi/linux/idxd.h @@ -295,7 +295,7 @@ struct dsa_completion_record { }; uint32_t delta_rec_size; - uint32_t crc_val; + uint64_t crc_val; /* DIF check & strip */ struct { diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h index 0723a9cce747..01717181339e 100644 --- a/include/uapi/linux/swab.h +++ b/include/uapi/linux/swab.h @@ -3,7 +3,7 @@ #define _UAPI_LINUX_SWAB_H #include <linux/types.h> -#include <linux/compiler.h> +#include <linux/stddef.h> #include <asm/bitsperlong.h> #include <asm/swab.h> |