]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
tools/testing/nvdimm, acpica: fix flag rename build breakage
authorDan Williams <dan.j.williams@intel.com>
Tue, 10 Nov 2015 23:50:33 +0000 (15:50 -0800)
committerDan Duval <dan.duval@oracle.com>
Wed, 7 Dec 2016 17:25:13 +0000 (12:25 -0500)
Orabug: 22913653

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>
(cherry picked from commit f42957967fb435aef6fc700fbbd9df89533b9a2e)
Signed-off-by: Dan Duval <dan.duval@oracle.com>
tools/testing/nvdimm/test/nfit.c

index dce346aa94eabbd3544189af7e3de528da960cb6..40ab4476c80a2039ab543cc94b09725789b2fe57 100644 (file)
@@ -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 */