Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42ff72cf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 94249117 7a14724f

include/uapi/linux/ndctl.h

+0 −37
Original line number Diff line number Diff line
@@ -145,43 +145,6 @@ struct nd_cmd_clear_error { 
	__u64 cleared;

} __packed;



struct nd_cmd_trans_spa {

	__u64 spa;

	__u32 status;

	__u8  flags;

	__u8  _reserved[3];

	__u64 trans_length;

	__u32 num_nvdimms;

	struct nd_nvdimm_device {

		__u32 nfit_device_handle;

		__u32 _reserved;

		__u64 dpa;

	} __packed devices[0];



} __packed;



struct nd_cmd_ars_err_inj {

	__u64 err_inj_spa_range_base;

	__u64 err_inj_spa_range_length;

	__u8  err_inj_options;

	__u32 status;

} __packed;



struct nd_cmd_ars_err_inj_clr {

	__u64 err_inj_clr_spa_range_base;

	__u64 err_inj_clr_spa_range_length;

	__u32 status;

} __packed;



struct nd_cmd_ars_err_inj_stat {

	__u32 status;

	__u32 inj_err_rec_count;

	struct nd_error_stat_query_record {

		__u64 err_inj_stat_spa_range_base;

		__u64 err_inj_stat_spa_range_length;

	} __packed record[0];

} __packed;



enum {

	ND_CMD_IMPLEMENTED = 0,