diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2015-11-11 00:50:33 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2015-11-12 18:21:18 +0100 |
| commit | f42957967fb435aef6fc700fbbd9df89533b9a2e (patch) | |
| tree | f777002a62ce4a091a8a99db0dd9e13db704db54 /tools/testing/nvdimm | |
| parent | Merge tag 'xfs-for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-f42957967fb435aef6fc700fbbd9df89533b9a2e.tar.xz linux-f42957967fb435aef6fc700fbbd9df89533b9a2e.zip | |
tools/testing/nvdimm, acpica: fix flag rename build breakage
Commit ca321d1ca672 "ACPICA: Update NFIT table to rename a flags field"
performed a tree-wide s/ACPI_NFIT_MEM_ARMED/ACPI_NFIT_MEM_NOT_ARMED/
operation, but missed the tools/testing/nvdimm/ directory.
Cc: Bob Moore <robert.moore@intel.com>
Cc: Lv Zheng <lv.zheng@intel.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'tools/testing/nvdimm')
| -rw-r--r-- | tools/testing/nvdimm/test/nfit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/nvdimm/test/nfit.c b/tools/testing/nvdimm/test/nfit.c index dce346aa94ea..40ab4476c80a 100644 --- a/tools/testing/nvdimm/test/nfit.c +++ b/tools/testing/nvdimm/test/nfit.c @@ -1135,7 +1135,7 @@ static void nfit_test1_setup(struct nfit_test *t) memdev->interleave_ways = 1; memdev->flags = ACPI_NFIT_MEM_SAVE_FAILED | ACPI_NFIT_MEM_RESTORE_FAILED | ACPI_NFIT_MEM_FLUSH_FAILED | ACPI_NFIT_MEM_HEALTH_OBSERVED - | ACPI_NFIT_MEM_ARMED; + | ACPI_NFIT_MEM_NOT_ARMED; offset += sizeof(*memdev); /* dcr-descriptor0 */ |