From bc3e213a691f988682a2f833953523a957e53358 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 28 Sep 2011 11:46:28 +0000 Subject: [PATCH] After fixing an svn/hg kerfluffle, there's a few files left over from last night's hwloc/paffinity/maffinity minor update. Nothing huge; just a little cleanup. This commit was SVN r25202. --- opal/mca/maffinity/base/base.h | 5 ----- opal/mca/maffinity/base/maffinity_base_open.c | 1 - opal/mca/maffinity/hwloc/maffinity_hwloc_module.c | 8 +++----- opal/mca/paffinity/hwloc/configure.m4 | 2 +- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/opal/mca/maffinity/base/base.h b/opal/mca/maffinity/base/base.h index 617d9c3daa..9536416c40 100644 --- a/opal/mca/maffinity/base/base.h +++ b/opal/mca/maffinity/base/base.h @@ -156,11 +156,6 @@ OPAL_DECLSPEC extern opal_list_t opal_maffinity_base_components_opened; */ extern int opal_maffinity_base_output; -/** - * Flag to indicate whether or not maffinity was setup - */ -OPAL_DECLSPEC extern bool opal_maffinity_setup; - END_C_DECLS #endif /* OPAL_MAFFINITY_BASE_H */ diff --git a/opal/mca/maffinity/base/maffinity_base_open.c b/opal/mca/maffinity/base/maffinity_base_open.c index 905036c1ff..78cd687629 100644 --- a/opal/mca/maffinity/base/maffinity_base_open.c +++ b/opal/mca/maffinity/base/maffinity_base_open.c @@ -52,7 +52,6 @@ int opal_maffinity_base_output = -1; bool opal_maffinity_base_components_opened_valid = false; opal_list_t opal_maffinity_base_components_opened; -bool opal_maffinity_setup = false; /* * Function for finding and opening either all MCA components, or the one diff --git a/opal/mca/maffinity/hwloc/maffinity_hwloc_module.c b/opal/mca/maffinity/hwloc/maffinity_hwloc_module.c index d8157991cb..398cd5f9f2 100644 --- a/opal/mca/maffinity/hwloc/maffinity_hwloc_module.c +++ b/opal/mca/maffinity/hwloc/maffinity_hwloc_module.c @@ -35,7 +35,7 @@ #include "opal/mca/maffinity/base/base.h" #include "opal/mca/hwloc/base/base.h" #include "maffinity_hwloc.h" -#include "opal/mca/hwloc/hwloc.h" +#include "opal/mca/hwloc/base/base.h" /* * Local functions @@ -123,8 +123,7 @@ static int hwloc_module_set(opal_maffinity_base_segment_t *segments, hwloc_bitmap_free(cpuset); } if (OPAL_SUCCESS != rc) { - return opal_hwloc_base_report_bind_failure(__FILE__, __LINE__, - msg, rc); + return opal_hwloc_base_report_bind_failure(__FILE__, __LINE__, msg, rc); } return OPAL_SUCCESS; } @@ -176,8 +175,7 @@ static int hwloc_module_bind(opal_maffinity_base_segment_t *segs, hwloc_bitmap_free(cpuset); } if (OPAL_SUCCESS != rc) { - return opal_hwloc_base_report_bind_failure(__FILE__, __LINE__, - msg, rc); + return opal_hwloc_base_report_bind_failure(__FILE__, __LINE__, msg, rc); } return OPAL_SUCCESS; } diff --git a/opal/mca/paffinity/hwloc/configure.m4 b/opal/mca/paffinity/hwloc/configure.m4 index 333129cd82..8943061beb 100644 --- a/opal/mca/paffinity/hwloc/configure.m4 +++ b/opal/mca/paffinity/hwloc/configure.m4 @@ -10,7 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. -# Copyright (c) 2007-2010 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2007-2011 Cisco Systems, Inc. All rights reserved. # # $COPYRIGHT$ #