* Fix issue with duplicate symbol for the initialize hook due to it existing in both libmpi and libopen-pal by removing the one for libopen-pal. This won't work if we eventually need registration caching in opal/orte, but I'm hoping that by that point, OFED will have gotten off its butt and properly integrated ummunotify into the verbs layer so that this code can go away.

At the same time, fix a minor issue where the init hook was being called twice, once by the libc malloc and once by our malloc by removing the call from our malloc.

This commit was SVN r28202.

ompi/runtime/ompi_mpi_init.c

@@ -95,7 +95,7 @@
    implicity from libmpi, there are times when the malloc initialize
    hook in the memory component doesn't work.  So we have to do it
    from here, since any MPI code is going to call MPI_Init... */
-void (*__malloc_initialize_hook) (void) = 
+OPAL_DECLSPEC void (*__malloc_initialize_hook) (void) = 
     opal_memory_linux_malloc_init_hook;
 #endif
 

opal/mca/memory/linux/arena.c

@@ -462,8 +462,11 @@ ptmalloc_init __MALLOC_P((void))
     if(s[0]) mALLOPt(M_CHECK_ACTION, (int)(s[0] - '0'));
     __malloc_check_init();
   }
+#if 0
+  /* OMPI Change: Don't call the initialize hook; it was us. */
   if(__malloc_initialize_hook != NULL)
     (*__malloc_initialize_hook)();
+#endif
 
   __malloc_initialized = 1;
 }

opal/mca/memory/linux/hooks.c

@@ -892,11 +892,6 @@ void opal_memory_linux_hook_pull(bool *want_hooks)
 
 
 
-/* OMPI change: This is the symbol to override to make the above
-   function get fired during malloc initialization time. */
-void (*__malloc_initialize_hook) (void) = 
-    opal_memory_linux_malloc_init_hook;
-
 /*
  * Local variables:
  * c-basic-offset: 4