Merge pull request #6901 from acgoldma/psm3-cuda-rbtree

prov/psm3: Fix psm3 cuda rbtree conflict

prov/psm3/Makefile.include

@@ -23,8 +23,7 @@ _psm3_files = \
 	prov/psm3/src/psmx3_wait.c
 
 _psm3_cppflags = \
-	-I$(top_srcdir)/prov/psm3 \
-	-I$(top_srcdir)/prov/psm3/include
+	-I$(top_srcdir)/prov/psm3
 
 chksum_srcs = $(_psm3_files)
 
@@ -38,9 +37,9 @@ _nodist_psm3_files = \
 _psm3_cppflags += \
 	-I$(top_srcdir)/prov/psm3/src \
 	-I$(top_srcdir)/prov/psm3/psm3 \
-	-I$(top_srcdir)/prov/psm3/psm3/ptl_ips/ \
-	-I$(top_srcdir)/prov/psm3/psm3/include/ \
-	-I$(top_srcdir)/prov/psm3/psm3/include/linux-i386/ \
+	-I$(top_srcdir)/prov/psm3/psm3/ptl_ips \
+	-I$(top_srcdir)/prov/psm3/psm3/include \
+	-I$(top_srcdir)/prov/psm3/psm3/include/linux-i386 \
 	-I$(top_srcdir)/prov/psm3/psm3/mpspawn \
 	-I$(top_srcdir)/prov/psm3/psm3/opa \
 	-I$(top_builddir)/prov/psm3/psm3 \
@@ -147,7 +146,7 @@ prov_psm3_psm3_libopa_la_SOURCES = \
 	prov/psm3/psm3/include/opa_udebug.h \
 	prov/psm3/psm3/include/opa_user.h \
 	prov/psm3/psm3/include/psm2_mock_testing.h \
-	prov/psm3/psm3/include/rbtree.h \
+	prov/psm3/psm3/include/psm3_rbtree.h \
 	prov/psm3/psm3/include/linux-i386/bit_ops.h \
 	prov/psm3/psm3/include/linux-i386/sysdep.h \
 	prov/psm3/psm3/mpspawn/mpspawn_stats.h
@@ -255,7 +254,7 @@ prov_psm3_psm3_libpsm3i_la_DEPENDENCIES = \
 	prov/psm3/psm3/libpsm_hal_gen1.la
 
 _psm3_extra_dist = \
-	prov/psm3/psm3/include/rbtree.c \
+	prov/psm3/psm3/include/psm3_rbtree.c \
 	prov/psm3/psm3/psm_hal_gen1/psm_hal_gen1_spio.c \
 	prov/psm3/psm3/opa/opa_dwordcpy-x86_64-fast.S
 EXTRA_DIST += $(_psm3_extra_dist)

prov/psm3/psm3/psm_verbs_mr.c

@@ -114,7 +114,7 @@ struct psm2_mr_cache_map_pl {
 // cl_map_item_t and cl_qmap_t structures
 #define RBTREE_MI_PL  struct psm2_verbs_mr
 #define RBTREE_MAP_PL struct psm2_mr_cache_map_pl
-#include "rbtree.h"
+#include "psm3_rbtree.h"
 
 struct psm2_mr_cache {
 	uint32_t max_entries;
@@ -201,7 +201,7 @@ static int mr_cache_key_cmp(const struct psm2_verbs_mr *a,
 #define RBTREE_ASSERT                     psmi_assert
 #define RBTREE_MAP_COUNT(PAYLOAD_PTR)     ((PAYLOAD_PTR)->nelems)
 #define RBTREE_NO_EMIT_IPS_CL_QMAP_PREDECESSOR
-#include "rbtree.c"
+#include "psm3_rbtree.c"
 
 // TBD - move to a utility macro header
 // taken fron IbAccess imath.h and imath.c

prov/psm3/psm3/ptl_am/am_cuda_memhandle_cache.c

@@ -126,8 +126,8 @@ static int cuda_cache_key_cmp(const cuda_cache_item *a, const cuda_cache_item *b
 #define RBTREE_MAP_COUNT(PAYLOAD_PTR)     ((PAYLOAD_PTR)->nelems)
 #define RBTREE_NO_EMIT_IPS_CL_QMAP_PREDECESSOR
 
-#include "rbtree.h"
-#include "rbtree.c"
+#include "psm3_rbtree.h"
+#include "psm3_rbtree.c"
 
 /*
  * Convenience rbtree cruft

prov/psm3/psm3/ptl_ips/ips_tidcache.h

@@ -115,7 +115,7 @@ typedef struct {
 #define RBTREE_MI_PL  rbtree_tidcache_mapitem_pl_t
 #define RBTREE_MAP_PL rbtree_tidcache_map_pl_t
 
-#include "rbtree.h"
+#include "psm3_rbtree.h"
 
 /*
  * Macro definition for easy programming.