diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-03-04 14:12:08 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-04 14:12:08 +0300 |
| commit | bc94b99636dc7bcccce439a9fb9c00065e2e2627 (patch) | |
| tree | bddbd29a5fd7b2d270d039efc1d6858791a2c98f /include/uapi/linux/ndctl.h | |
| parent | 4650bac1fc45d64aef62ab99aa4db93d41dedbd9 (diff) | |
| parent | fc77dbd34c5c99bce46d40a2491937c3bcbd10af (diff) | |
| download | linux-bc94b99636dc7bcccce439a9fb9c00065e2e2627.tar.xz | |
Merge tag 'v4.5-rc6' into core/resources, to resolve conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/ndctl.h')
| -rw-r--r-- | include/uapi/linux/ndctl.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/uapi/linux/ndctl.h b/include/uapi/linux/ndctl.h index 5b4a4be06e2b..cc68b92124d4 100644 --- a/include/uapi/linux/ndctl.h +++ b/include/uapi/linux/ndctl.h @@ -66,14 +66,18 @@ struct nd_cmd_ars_cap { __u64 length; __u32 status; __u32 max_ars_out; + __u32 clear_err_unit; + __u32 reserved; } __packed; struct nd_cmd_ars_start { __u64 address; __u64 length; __u16 type; - __u8 reserved[6]; + __u8 flags; + __u8 reserved[5]; __u32 status; + __u32 scrub_time; } __packed; struct nd_cmd_ars_status { @@ -81,11 +85,14 @@ struct nd_cmd_ars_status { __u32 out_length; __u64 address; __u64 length; + __u64 restart_address; + __u64 restart_length; __u16 type; + __u16 flags; __u32 num_records; struct nd_ars_record { __u32 handle; - __u32 flags; + __u32 reserved; __u64 err_address; __u64 length; } __packed records[0]; |