Skip to content

Commit 42ff72c

Browse files
committed
Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm fix from Dan Williams: "A single patch removing some structure definitions from a uapi header file. These payloads are never processed directly by the kernel they are simply passed through an ioctl as opaque blobs to the ACPI _DSM (Device Specific Method) interface. Userspace should not be depending on the kernel to define these payloads. We will instead provide these definitions via the existing libndctl (https://github.com/pmem/ndctl) project that has NVDIMM command helpers and other definitions" * 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: libnvdimm: clean up command definitions
2 parents 9424911 + 7a14724 commit 42ff72c

File tree

1 file changed

+0
-37
lines changed

1 file changed

+0
-37
lines changed

include/uapi/linux/ndctl.h

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -145,43 +145,6 @@ struct nd_cmd_clear_error {
145145
__u64 cleared;
146146
} __packed;
147147

148-
struct nd_cmd_trans_spa {
149-
__u64 spa;
150-
__u32 status;
151-
__u8 flags;
152-
__u8 _reserved[3];
153-
__u64 trans_length;
154-
__u32 num_nvdimms;
155-
struct nd_nvdimm_device {
156-
__u32 nfit_device_handle;
157-
__u32 _reserved;
158-
__u64 dpa;
159-
} __packed devices[0];
160-
161-
} __packed;
162-
163-
struct nd_cmd_ars_err_inj {
164-
__u64 err_inj_spa_range_base;
165-
__u64 err_inj_spa_range_length;
166-
__u8 err_inj_options;
167-
__u32 status;
168-
} __packed;
169-
170-
struct nd_cmd_ars_err_inj_clr {
171-
__u64 err_inj_clr_spa_range_base;
172-
__u64 err_inj_clr_spa_range_length;
173-
__u32 status;
174-
} __packed;
175-
176-
struct nd_cmd_ars_err_inj_stat {
177-
__u32 status;
178-
__u32 inj_err_rec_count;
179-
struct nd_error_stat_query_record {
180-
__u64 err_inj_stat_spa_range_base;
181-
__u64 err_inj_stat_spa_range_length;
182-
} __packed record[0];
183-
} __packed;
184-
185148
enum {
186149
ND_CMD_IMPLEMENTED = 0,
187150

0 commit comments

Comments
 (0)