diff options
author | Vinod Koul <vkoul@kernel.org> | 2020-08-05 19:02:07 +0530 |
---|---|---|
committer | Vinod Koul <vkoul@kernel.org> | 2020-08-05 19:02:07 +0530 |
commit | 0b5ad7b9522e6172342511fac6114fd8b7eb622a (patch) | |
tree | b6a29560e6364bd98634564181cab54a3b6164a4 /include/uapi/linux/idxd.h | |
parent | 87730ccbddcb48478b1b88e88b14e73424130764 (diff) | |
parent | 6bd0dffa1a6e19e73964ae47c964f57c625cce05 (diff) | |
download | linux-0b5ad7b9522e6172342511fac6114fd8b7eb622a.tar.gz linux-0b5ad7b9522e6172342511fac6114fd8b7eb622a.tar.bz2 linux-0b5ad7b9522e6172342511fac6114fd8b7eb622a.zip |
Merge branch 'for-linus' into fixes
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Conflicts:
drivers/dma/idxd/sysfs.c
Diffstat (limited to 'include/uapi/linux/idxd.h')
-rw-r--r-- | include/uapi/linux/idxd.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/uapi/linux/idxd.h b/include/uapi/linux/idxd.h index e103c1434e4b..fdcdfe414223 100644 --- a/include/uapi/linux/idxd.h +++ b/include/uapi/linux/idxd.h @@ -181,6 +181,12 @@ struct dsa_completion_record { uint32_t bytes_completed; uint64_t fault_addr; union { + /* common record */ + struct { + uint32_t invalid_flags:24; + uint32_t rsvd2:8; + }; + uint16_t delta_rec_size; uint16_t crc_val; |