Merge pull request #1106 from hjelmn/v2.x_typos

jsquyres · jsquyres · commit 4f26a900ab96 · 2016-04-27T17:58:01.000-04:00
memory: fix typo
diff --git a/contrib/platform/lanl/cray_xc_cle5.2/debug-common b/contrib/platform/lanl/cray_xc_cle5.2/debug-common
@@ -32,8 +32,5 @@ enable_mca_direct=pml-ob1
 # enable development headers
 with_devel_headers=yes
 
-# enable ptmalloc (enables lazy deregistration)
-with_memory_manager=linux
-
 # disable valgrind
 with_valgrind=no
diff --git a/contrib/platform/lanl/cray_xc_cle5.2/optimized-common b/contrib/platform/lanl/cray_xc_cle5.2/optimized-common
@@ -40,8 +40,5 @@ enable_mca_direct=pml-ob1
 # enable development headers
 with_devel_headers=yes
 
-# enable ptmalloc (enables lazy deregistration)
-with_memory_manager=linux
-
 # disable valgrind
 with_valgrind=no
diff --git a/contrib/platform/lanl/darwin/darwin-common b/contrib/platform/lanl/darwin/darwin-common
@@ -22,9 +22,6 @@ enable_cxx_exceptions=no
 # Disable components not needed on any TOSS platform
 enable_mca_no_build=carto,crs,filem,routed-linear,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,btl-tcp
 
-# Enable malloc hooks for mpi_leave_pinned
-with_memory_manager=linux
-
 # TOSS2 uses slurm
 with_slurm=yes
 with_tm=no
diff --git a/contrib/platform/lanl/toss/toss-common b/contrib/platform/lanl/toss/toss-common
@@ -22,9 +22,6 @@ enable_cxx_exceptions=no
 # Disable components not needed on any TOSS platform
 enable_mca_no_build=carto,crs,filem,routed-linear,snapc,pml-dr,pml-crcp2,pml-crcpw,pml-v,pml-example,crcp,btl-tcp
 
-# Enable malloc hooks for mpi_leave_pinned
-with_memory_manager=linux
-
 # TOSS2 uses slurm
 with_slurm=yes
 with_tm=no
diff --git a/opal/mca/memory/base/memory_base_open.c b/opal/mca/memory/base/memory_base_open.c
@@ -113,7 +113,7 @@ static int opal_memory_base_open(mca_base_open_flag_t flags)
 #if MEMORY_LINUX_PTMALLOC2
         /* See above comment about linux/ptmalloc2 about why this
            abstraction violation is here. */
-        if (0 == strcmp (tmp->mca_component_name, "linux")) {
+        if (0 == strcmp (tmp->memoryc_version.mca_component_name, "linux")) {
             /* if ptmalloc is enabled always use it */
             priority = 1000000;
         }
diff --git a/opal/mca/memory/linux/configure.m4 b/opal/mca/memory/linux/configure.m4
@@ -19,7 +19,7 @@
 #
 # $HEADER$
 #
-AC_DEFUN([MCA_opal_memory_linux_PRIORITY], [40])
+AC_DEFUN([MCA_opal_memory_linux_PRIORITY], [41])
 
 AC_DEFUN([MCA_opal_memory_linux_COMPILE_MODE], [
     AC_MSG_CHECKING([for MCA component $2:$3 compile mode])

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ static int opal_memory_base_open(mca_base_open_flag_t flags)`
`113`	`113`	`#if MEMORY_LINUX_PTMALLOC2`
`114`	`114`	`/* See above comment about linux/ptmalloc2 about why this`
`115`	`115`	`abstraction violation is here. */`
`116`		`- if (0 == strcmp (tmp->mca_component_name, "linux")) {`
	`116`	`+ if (0 == strcmp (tmp->memoryc_version.mca_component_name, "linux")) {`
`117`	`117`	`/* if ptmalloc is enabled always use it */`
`118`	`118`	`priority = 1000000;`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`#`
`20`	`20`	`# $HEADER$`
`21`	`21`	`#`
`22`		`-AC_DEFUN([MCA_opal_memory_linux_PRIORITY], [40])`
	`22`	`+AC_DEFUN([MCA_opal_memory_linux_PRIORITY], [41])`
`23`	`23`
`24`	`24`	`AC_DEFUN([MCA_opal_memory_linux_COMPILE_MODE], [`
`25`	`25`	`AC_MSG_CHECKING([for MCA component $2:$3 compile mode])`