From: Dan Williams <dan.j.williams@intel.com>
Date: Wed, 18 May 2016 17:06:59 +0000 (-0700)
Subject: Merge branch 'for-4.7/dsm' into libnvdimm-for-next
X-Git-Tag: v4.7-rc1~78^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f716d05f8daee4f393dc568ea7a53c7ecfd0bfc;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'for-4.7/dsm' into libnvdimm-for-next
---

1f716d05f8daee4f393dc568ea7a53c7ecfd0bfc
diff --cc drivers/acpi/nfit.h
index 5201840c1147e,f82fda55b6de4..46c50148e4b79
--- a/drivers/acpi/nfit.h
+++ b/drivers/acpi/nfit.h
@@@ -109,8 -120,8 +120,9 @@@ struct nfit_mem 
  	struct nfit_flush *nfit_flush;
  	struct list_head list;
  	struct acpi_device *adev;
 +	struct acpi_nfit_desc *acpi_desc;
  	unsigned long dsm_mask;
+ 	int family;
  };
  
  struct acpi_nfit_desc {
diff --cc tools/testing/nvdimm/test/nfit.c
index d1c98d4386d4b,e09a300eb8e07..c919866853a04
--- a/tools/testing/nvdimm/test/nfit.c
+++ b/tools/testing/nvdimm/test/nfit.c
@@@ -1293,15 -1267,13 +1309,15 @@@ static void nfit_test0_setup(struct nfi
  	post_ars_status(&t->ars_state, t->spa_set_dma[0], SPA0_SIZE);
  
  	acpi_desc = &t->acpi_desc;
- 	set_bit(ND_CMD_GET_CONFIG_SIZE, &acpi_desc->dimm_dsm_force_en);
- 	set_bit(ND_CMD_GET_CONFIG_DATA, &acpi_desc->dimm_dsm_force_en);
- 	set_bit(ND_CMD_SET_CONFIG_DATA, &acpi_desc->dimm_dsm_force_en);
- 	set_bit(ND_CMD_SMART, &acpi_desc->dimm_dsm_force_en);
- 	set_bit(ND_CMD_ARS_CAP, &acpi_desc->bus_dsm_force_en);
- 	set_bit(ND_CMD_ARS_START, &acpi_desc->bus_dsm_force_en);
- 	set_bit(ND_CMD_ARS_STATUS, &acpi_desc->bus_dsm_force_en);
- 	set_bit(ND_CMD_CLEAR_ERROR, &acpi_desc->bus_dsm_force_en);
- 	set_bit(ND_CMD_SMART_THRESHOLD, &acpi_desc->dimm_dsm_force_en);
+ 	set_bit(ND_CMD_GET_CONFIG_SIZE, &acpi_desc->dimm_cmd_force_en);
+ 	set_bit(ND_CMD_GET_CONFIG_DATA, &acpi_desc->dimm_cmd_force_en);
+ 	set_bit(ND_CMD_SET_CONFIG_DATA, &acpi_desc->dimm_cmd_force_en);
++	set_bit(ND_CMD_SMART, &acpi_desc->dimm_cmd_force_en);
+ 	set_bit(ND_CMD_ARS_CAP, &acpi_desc->bus_cmd_force_en);
+ 	set_bit(ND_CMD_ARS_START, &acpi_desc->bus_cmd_force_en);
+ 	set_bit(ND_CMD_ARS_STATUS, &acpi_desc->bus_cmd_force_en);
+ 	set_bit(ND_CMD_CLEAR_ERROR, &acpi_desc->bus_cmd_force_en);
++	set_bit(ND_CMD_SMART_THRESHOLD, &acpi_desc->dimm_cmd_force_en);
  }
  
  static void nfit_test1_setup(struct nfit_test *t)