From f9e813a00350b76f5f0d165ab4a3edfa1fb0694f Mon Sep 17 00:00:00 2001
From: Mike Dubman <miked@mellanox.com>
Date: Wed, 16 Apr 2014 20:00:34 +0000
Subject: [PATCH] OSHMEM: revert r31412, it did not pass jenkins

This commit was SVN r31414.

The following SVN revision numbers were found above:
  r31412 --> open-mpi/ompi@b0ade11ae4ca2025e6342285c33710578c234138
---
 oshmem/shmem/c/shmem_barrier.c | 5 ++++-
 oshmem/shmem/c/shmem_get.c     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/oshmem/shmem/c/shmem_barrier.c b/oshmem/shmem/c/shmem_barrier.c
index e6f80d0d5d..f44bb32dfd 100644
--- a/oshmem/shmem/c/shmem_barrier.c
+++ b/oshmem/shmem/c/shmem_barrier.c
@@ -24,7 +24,6 @@
 #if OSHMEM_PROFILING
 #include "oshmem/include/pshmem.h"
 #pragma weak shmem_barrier = pshmem_barrier
-#pragma weak shmem_barrier_all = pshmem_barrier_all
 #include "oshmem/shmem/c/profile/defines.h"
 #endif
 
@@ -75,6 +74,10 @@ void shmem_barrier(int PE_start, int logPE_stride, int PE_size, long *pSync)
     RUNTIME_CHECK_RC(rc);
 }
 
+#if OSHMEM_PROFILING
+#pragma weak shmem_barrier_all = pshmem_barrier_all
+#endif
+
 void shmem_barrier_all(void)
 {
     int rc = OSHMEM_SUCCESS;
diff --git a/oshmem/shmem/c/shmem_get.c b/oshmem/shmem/c/shmem_get.c
index 3e577b051b..1ee3edaa01 100644
--- a/oshmem/shmem/c/shmem_get.c
+++ b/oshmem/shmem/c/shmem_get.c
@@ -52,6 +52,7 @@
 #pragma weak shmem_float_get = pshmem_float_get
 #pragma weak shmem_double_get = pshmem_double_get
 #pragma weak shmem_longdouble_get = pshmem_longdouble_get
+#include "oshmem/shmem/c/profile/defines.h"
 #endif
 
 SHMEM_TYPE_GET(_char, char)
@@ -89,7 +90,6 @@ SHMEM_TYPE_GET(_longdouble, long double)
 #pragma weak shmem_get32 = pshmem_get32
 #pragma weak shmem_get64 = pshmem_get64
 #pragma weak shmem_get128 = pshmem_get128
-#include "oshmem/shmem/c/profile/defines.h"
 #endif
 
 SHMEM_TYPE_GETMEM(_getmem, 1)