From patchwork Wed Nov 4 20:58:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Smith, Stan" X-Patchwork-Id: 57771 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA4KwItL003334 for ; Wed, 4 Nov 2009 20:58:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932299AbZKDU6M (ORCPT ); Wed, 4 Nov 2009 15:58:12 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932330AbZKDU6M (ORCPT ); Wed, 4 Nov 2009 15:58:12 -0500 Received: from mga11.intel.com ([192.55.52.93]:60563 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932299AbZKDU6L (ORCPT ); Wed, 4 Nov 2009 15:58:11 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 04 Nov 2009 12:55:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.44,682,1249282800"; d="scan'208";a="510774022" Received: from scsmith-mobl1.amr.corp.intel.com (HELO scsmithMOBL1) ([10.7.151.219]) by fmsmga002.fm.intel.com with ESMTP; 04 Nov 2009 12:52:21 -0800 From: "Stan C. Smith" To: "'Sasha Khapyorsky'" Cc: , Subject: [PATCH 1/2] contain pthreads defs with ifdef HAVE_LIBPTHREAD Date: Wed, 4 Nov 2009 12:58:16 -0800 Message-ID: MIME-Version: 1.0 X-Mailer: Microsoft Office Outlook 11 Thread-Index: AcpdkYe6ej5NfiTDQX+x+4966lLOdg== X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.5579 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org diff --git a/opensm/include/vendor/osm_vendor_ibumad.h b/opensm/include/vendor/osm_vendor_ibumad.h index 0a4692d..d523412 100644 --- a/opensm/include/vendor/osm_vendor_ibumad.h +++ b/opensm/include/vendor/osm_vendor_ibumad.h @@ -160,8 +160,13 @@ typedef struct _osm_vendor { char ca_names[OSM_UMAD_MAX_CAS][UMAD_CA_NAME_LEN]; vendor_match_tbl_t mtbl; umad_port_t umad_port; +#ifdef HAVE_LIBPTHREAD pthread_mutex_t cb_mutex; pthread_mutex_t match_tbl_mutex; +#else + cl_mutex_t cb_mutex; + cl_mutex_t match_tbl_mutex; +#endif int umad_port_id; void *receiver; int issmfd;