Update LANL platform files for changes in linux memory hook configuration.

No review necessary cmr=v1.7.3:reviewer=ompi-gk1.7 This commit was SVN r28969.
2013-07-31 17:56:22 +00:00 · 2013-07-31 17:56:22 +00:00 · 278522d8e8
--- a/contrib/platform/lanl/cray_xe6/debug-common
+++ b/contrib/platform/lanl/cray_xe6/debug-common
@ -34,7 +34,7 @@ enable_mca_direct=pml-ob1
 with_devel_headers=yes

 # enable ptmalloc (enables lazy deregistration)
-with_memory_manager=ptmalloc2
+with_memory_manager=linux

 # disable valgrind
 with_valgrind=no
--- a/contrib/platform/lanl/cray_xe6/optimized-common
+++ b/contrib/platform/lanl/cray_xe6/optimized-common
@ -41,7 +41,7 @@ enable_mca_direct=pml-ob1
 with_devel_headers=yes

 # enable ptmalloc (enables lazy deregistration)
-with_memory_manager=ptmalloc2
+with_memory_manager=linux

 # disable valgrind
 with_valgrind=no
--- a/contrib/platform/lanl/tlcc/debug-nopanasas
+++ b/contrib/platform/lanl/tlcc/debug-nopanasas
@ -23,5 +23,5 @@ with_verbs=yes
 with_devel_headers=yes
 with_tm=no
 with_io_romio_flags=--with-file-system=ufs+nfs
-with_memory_manager=ptmalloc2
+with_memory_manager=linux
 with_valgrind=no
--- a/contrib/platform/lanl/tlcc/debug-panasas
+++ b/contrib/platform/lanl/tlcc/debug-panasas
@ -23,7 +23,7 @@ with_tm=no
 with_verbs=yes
 with_devel_headers=yes
 with_io_romio_flags=--with-file-system=ufs+nfs+panfs
-with_memory_manager=ptmalloc2
+with_memory_manager=linux
 with_valgrind=no
 CFLAGS="-I/opt/panfs/include"
 CXXFLAGS="-I/opt/panfs/include"
--- a/contrib/platform/lanl/tlcc/optimized-nopanasas
+++ b/contrib/platform/lanl/tlcc/optimized-nopanasas
@ -23,5 +23,5 @@ with_tm=no
 with_verbs=yes
 with_devel_headers=yes
 with_io_romio_flags=--with-file-system=ufs+nfs
-with_memory_manager=ptmalloc2
+with_memory_manager=linux
 with_valgrind=no
--- a/contrib/platform/lanl/tlcc/optimized-panasas
+++ b/contrib/platform/lanl/tlcc/optimized-panasas
@ -23,7 +23,7 @@ with_tm=no
 with_verbs=yes
 with_devel_headers=yes
 with_io_romio_flags=--with-file-system=ufs+nfs+panfs
-with_memory_manager=ptmalloc2
+with_memory_manager=linux
 with_valgrind=no
 CFLAGS="-I/opt/panfs/include"
 CXXFLAGS="-I/opt/panfs/include"
--- a/contrib/platform/lanl/tlcc2/debug-nopanasas
+++ b/contrib/platform/lanl/tlcc2/debug-nopanasas
@ -24,5 +24,5 @@ with_verbs=yes
 with_psm=yes
 with_devel_headers=yes
 with_io_romio_flags=--with-file-system=ufs+nfs
-with_memory_manager=ptmalloc2
+with_memory_manager=linux
 with_valgrind=no
--- a/contrib/platform/lanl/tlcc2/debug-panasas
+++ b/contrib/platform/lanl/tlcc2/debug-panasas
@ -24,7 +24,7 @@ with_verbs=yes
 with_psm=yes
 with_devel_headers=yes
 with_io_romio_flags=--with-file-system=ufs+nfs+panfs
-with_memory_manager=ptmalloc2
+with_memory_manager=linux
 with_valgrind=no
 CFLAGS="-I/opt/panfs/include"
 CXXFLAGS="-I/opt/panfs/include"
--- a/contrib/platform/lanl/tlcc2/optimized-nopanasas
+++ b/contrib/platform/lanl/tlcc2/optimized-nopanasas
@ -24,5 +24,5 @@ with_verbs=yes
 with_psm=yes
 with_devel_headers=yes
 with_io_romio_flags=--with-file-system=ufs+nfs
-with_memory_manager=ptmalloc2
+with_memory_manager=linux
 with_valgrind=no
--- a/contrib/platform/lanl/tlcc2/optimized-panasas
+++ b/contrib/platform/lanl/tlcc2/optimized-panasas
@ -24,7 +24,7 @@ with_verbs=yes
 with_psm=yes
 with_devel_headers=yes
 with_io_romio_flags=--with-file-system=ufs+nfs+panfs
-with_memory_manager=ptmalloc2
+with_memory_manager=linux
 with_valgrind=no
 CFLAGS="-I/opt/panfs/include"
 CXXFLAGS="-I/opt/panfs/include"