From patchwork Fri Nov 13 13:51:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Krivenok X-Patchwork-Id: 7611601 Return-Path: X-Original-To: patchwork-linux-nvdimm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 41C529F2F7 for ; Fri, 13 Nov 2015 13:51:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 77E72206DB for ; Fri, 13 Nov 2015 13:51:44 +0000 (UTC) Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B525820742 for ; Fri, 13 Nov 2015 13:51:43 +0000 (UTC) Received: from ml01.vlan14.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 939481A1FAB; Fri, 13 Nov 2015 05:51:43 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from mail-yk0-x232.google.com (mail-yk0-x232.google.com [IPv6:2607:f8b0:4002:c07::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 16CF91A1FAB for ; Fri, 13 Nov 2015 05:51:43 -0800 (PST) Received: by ykba77 with SMTP id a77so146066607ykb.2 for ; Fri, 13 Nov 2015 05:51:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=Yjt3sYILwXHrcjSCvXH/r26+jSJCdvvd2qnCSILcd/c=; b=XMNcc+JHJYwsQx/Tfv37JZq/TD9+h7bsqrbPbBpdzK9ikB+vj1P+Gavg8uDoZSSpH8 F8hA+nw9tkQ1GcKz90u8F1AfJWA3ZFLMYknSVsdUeeeSf9KxH1WcrZ+UTjlYB2ws+YVg YCYUnP0a9y9hDCmXxNbdNReGKjprrD3EPMca6Kzrw7xzrGyzKwtuQvVUTJ5fgX4f2+Ol eBgi/TAcZe78tqpcTtG3tAJGyAsM6Mvcr7/Zipcl0ytldVmVvcMZWQiXKAmMnT7TVPBX ZHwoyQ7ffhvTXWvXHFwVLjQlfuX60eGh6FU0Qp+5ROEau5naMURpzh/f/FWuGS+/bVTT 76Vw== MIME-Version: 1.0 X-Received: by 10.129.128.135 with SMTP id q129mr20734859ywf.325.1447422702062; Fri, 13 Nov 2015 05:51:42 -0800 (PST) Received: by 10.129.38.136 with HTTP; Fri, 13 Nov 2015 05:51:42 -0800 (PST) Date: Fri, 13 Nov 2015 16:51:42 +0300 Message-ID: Subject: [PATCH 1/1] Fix nfit_test compilation error From: Dmitry Krivenok To: linux-acpi@vger.kernel.org, linux-nvdimm@lists.01.org Cc: Bob Moore X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP nfit_test wasn't changed in commit ca321d1c where "ARMED" was renamed to "NOT_ARMED". Adding one more change to fix the build. Signed-off-by: Dmitry V. Krivenok --- 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 dce346a..40ab447 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 */