diff mbox

tools/testing/nvdimm, acpica: fix flag rename build breakage

Message ID 20151110235921.1876.27564.stgit@dwillia2-desk3.jf.intel.com (mailing list archive)
State Accepted
Commit f42957967fb4
Headers show

Commit Message

Dan Williams Nov. 11, 2015, midnight UTC
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>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---

I'm working to get build regression coverage for this directory in 0day.

 tools/testing/nvdimm/test/nfit.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Rafael J. Wysocki Nov. 11, 2015, 12:07 a.m. UTC | #1
Hi,

On Wed, Nov 11, 2015 at 1:00 AM, Dan Williams <dan.j.williams@intel.com> wrote:
> 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>
> Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> Signed-off-by: Dan Williams <dan.j.williams@intel.com>

Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Or if you want me to take this patch, I can do that next week.

> ---
>
> I'm working to get build regression coverage for this directory in 0day.
>
>  tools/testing/nvdimm/test/nfit.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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 */
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Dan Williams Nov. 11, 2015, 12:10 a.m. UTC | #2
On Tue, Nov 10, 2015 at 4:07 PM, Rafael J. Wysocki <rafael@kernel.org> wrote:
> Hi,
>
> On Wed, Nov 11, 2015 at 1:00 AM, Dan Williams <dan.j.williams@intel.com> wrote:
>> 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>
>> Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
>
> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> Or if you want me to take this patch, I can do that next week.
>

Thanks I'll roll it in with another fix I have pending through the nvdimm tree.
diff mbox

Patch

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 */