From patchwork Fri Mar 8 13:51:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cyril Hrubis X-Patchwork-Id: 1053532 X-Patchwork-Delegate: petr.vorel@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44G87T5bxnz9s7h for ; Sat, 9 Mar 2019 00:52:04 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id B92143EA7ED for ; Fri, 8 Mar 2019 14:52:01 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [217.194.8.7]) by picard.linux.it (Postfix) with ESMTP id 00DA03EA79A for ; Fri, 8 Mar 2019 14:51:59 +0100 (CET) Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-7.smtp.seeweb.it (Postfix) with ESMTPS id 1479920118F for ; Fri, 8 Mar 2019 14:51:57 +0100 (CET) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 59356ADA9; Fri, 8 Mar 2019 13:51:57 +0000 (UTC) From: Cyril Hrubis To: ltp@lists.linux.it Date: Fri, 8 Mar 2019 14:51:14 +0100 Message-Id: <20190308135114.5120-1-chrubis@suse.cz> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-7.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=7.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH] libltpnuma: Fix compilation with libnuma v1 X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" With libnuma v1 HAVE_NUMA_H is defined but $(NUMA_LIBS) is not, which leads to compilation failures on very very old distributions. Signed-off-by: Cyril Hrubis CC: Petr Vorel CC: Jan Stancek Acked-by: Petr Vorel --- libs/libltpnuma/tst_numa.c | 4 ++-- testcases/kernel/syscalls/set_mempolicy/set_mempolicy01.c | 6 +++--- testcases/kernel/syscalls/set_mempolicy/set_mempolicy02.c | 6 +++--- testcases/kernel/syscalls/set_mempolicy/set_mempolicy03.c | 6 +++--- testcases/kernel/syscalls/set_mempolicy/set_mempolicy04.c | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libs/libltpnuma/tst_numa.c b/libs/libltpnuma/tst_numa.c index 6bd23e949..0ba6daf39 100644 --- a/libs/libltpnuma/tst_numa.c +++ b/libs/libltpnuma/tst_numa.c @@ -8,7 +8,7 @@ #include #include #include "config.h" -#ifdef HAVE_NUMA_H +#ifdef HAVE_NUMA_V2 # include # include #endif @@ -43,7 +43,7 @@ void tst_nodemap_free(struct tst_nodemap *nodes) free(nodes); } -#ifdef HAVE_NUMA_H +#ifdef HAVE_NUMA_V2 const char *tst_numa_mode_name(int mode) { diff --git a/testcases/kernel/syscalls/set_mempolicy/set_mempolicy01.c b/testcases/kernel/syscalls/set_mempolicy/set_mempolicy01.c index d3c17bb9b..96a275411 100644 --- a/testcases/kernel/syscalls/set_mempolicy/set_mempolicy01.c +++ b/testcases/kernel/syscalls/set_mempolicy/set_mempolicy01.c @@ -13,14 +13,14 @@ #include #include "config.h" -#ifdef HAVE_NUMA_H +#ifdef HAVE_NUMA_V2 # include # include #endif #include "tst_test.h" #include "tst_numa.h" -#ifdef HAVE_NUMA_H +#ifdef HAVE_NUMA_V2 #include "set_mempolicy.h" @@ -117,4 +117,4 @@ static struct tst_test test = { TST_TEST_TCONF(NUMA_ERROR_MSG); -#endif /* HAVE_NUMA_H */ +#endif /* HAVE_NUMA_V2 */ diff --git a/testcases/kernel/syscalls/set_mempolicy/set_mempolicy02.c b/testcases/kernel/syscalls/set_mempolicy/set_mempolicy02.c index e257c1c2c..4cdec1785 100644 --- a/testcases/kernel/syscalls/set_mempolicy/set_mempolicy02.c +++ b/testcases/kernel/syscalls/set_mempolicy/set_mempolicy02.c @@ -14,14 +14,14 @@ #include #include "config.h" -#ifdef HAVE_NUMA_H +#ifdef HAVE_NUMA_V2 # include # include #endif #include "tst_test.h" #include "tst_numa.h" -#ifdef HAVE_NUMA_H +#ifdef HAVE_NUMA_V2 #include "set_mempolicy.h" @@ -116,4 +116,4 @@ static struct tst_test test = { TST_TEST_TCONF(NUMA_ERROR_MSG); -#endif /* HAVE_NUMA_H */ +#endif /* HAVE_NUMA_V2 */ diff --git a/testcases/kernel/syscalls/set_mempolicy/set_mempolicy03.c b/testcases/kernel/syscalls/set_mempolicy/set_mempolicy03.c index eb3e046f2..24775de10 100644 --- a/testcases/kernel/syscalls/set_mempolicy/set_mempolicy03.c +++ b/testcases/kernel/syscalls/set_mempolicy/set_mempolicy03.c @@ -11,7 +11,7 @@ #include #include "config.h" -#ifdef HAVE_NUMA_H +#ifdef HAVE_NUMA_V2 # include # include #endif @@ -21,7 +21,7 @@ #define MNTPOINT "mntpoint" #define PAGES_ALLOCATED 16u -#ifdef HAVE_NUMA_H +#ifdef HAVE_NUMA_V2 #include "set_mempolicy.h" @@ -110,4 +110,4 @@ static struct tst_test test = { TST_TEST_TCONF(NUMA_ERROR_MSG); -#endif /* HAVE_NUMA_H */ +#endif /* HAVE_NUMA_V2 */ diff --git a/testcases/kernel/syscalls/set_mempolicy/set_mempolicy04.c b/testcases/kernel/syscalls/set_mempolicy/set_mempolicy04.c index 60601e7c1..8d8aa988d 100644 --- a/testcases/kernel/syscalls/set_mempolicy/set_mempolicy04.c +++ b/testcases/kernel/syscalls/set_mempolicy/set_mempolicy04.c @@ -22,7 +22,7 @@ #include #include #include "config.h" -#ifdef HAVE_NUMA_H +#ifdef HAVE_NUMA_V2 # include # include #endif @@ -32,7 +32,7 @@ #define MNTPOINT "mntpoint" #define FILES 10 -#ifdef HAVE_NUMA_H +#ifdef HAVE_NUMA_V2 #include "set_mempolicy.h" @@ -139,4 +139,4 @@ static struct tst_test test = { TST_TEST_TCONF(NUMA_ERROR_MSG); -#endif /* HAVE_NUMA_H */ +#endif /* HAVE_NUMA_V2 */