diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2022-12-20 15:02:21 -0800 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2022-12-20 15:02:21 -0800 |
| commit | 71f6861cbf4537b4d890ab2328492c521adb00ef (patch) | |
| tree | 58f4fb795fed3f4b2c1cb6bbac9ed25b3134d390 /include/uapi/linux | |
| parent | ad40920e0080e28868b6010a5d433c9cfc8ba7ad (diff) | |
| parent | 1644d755d0b06d0f1ee93e1c44336c29386546b4 (diff) | |
Merge branch 'master' into mm-stable
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/idxd.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/swab.h | 2 |
2 files changed, 2 insertions, 2 deletions
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> |