From 4e0c15c04a38966d712385120cc72c788b8f19f9 Mon Sep 17 00:00:00 2001 From: "Pavel Shamis (Pasha)" Date: Tue, 24 May 2016 14:53:25 -0500 Subject: [PATCH] CMA: Fixing logic for CMA system call detection The OPAL_CMA_NEED_SYSCALL_DEFS is always defined/set to 0 or 1. Therefore instead of checking if the macro is defined, we have to look at the value itself. Signed-off-by: Pavel Shamis (Pasha) (cherry picked from commit d984b4b3f9f18a4dfae9a1ef3e9e7f2fbd1f0e33) Signed-off-by: KAWASHIMA Takahiro --- opal/mca/btl/sm/btl_sm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/opal/mca/btl/sm/btl_sm.c b/opal/mca/btl/sm/btl_sm.c index 842a07b91dd..b674d8d787a 100644 --- a/opal/mca/btl/sm/btl_sm.c +++ b/opal/mca/btl/sm/btl_sm.c @@ -19,6 +19,7 @@ * Copyright (c) 2013-2015 Intel, Inc. All rights reserved. * Copyright (c) 2014-2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2016 ARM, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -41,7 +42,7 @@ #include #endif /* HAVE_SYS_MMAN_H */ -#if OPAL_BTL_SM_HAVE_CMA && defined(OPAL_CMA_NEED_SYSCALL_DEFS) +#if OPAL_BTL_SM_HAVE_CMA && OPAL_CMA_NEED_SYSCALL_DEFS #include "opal/sys/cma.h" #endif /* OPAL_CMA_NEED_SYSCALL_DEFS */