From 3f703afb97c98f83afb9b7d8f9298515d4292816 Mon Sep 17 00:00:00 2001 From: Rolf vandeVaart Date: Wed, 23 Jul 2014 21:10:17 +0000 Subject: [PATCH] Fix CUDA registration where we run out of memory being allocated. This commit was SVN r32297. --- ompi/mca/mpool/sm/mpool_sm_module.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ompi/mca/mpool/sm/mpool_sm_module.c b/ompi/mca/mpool/sm/mpool_sm_module.c index 2228f87952..2cfcf0a970 100644 --- a/ompi/mca/mpool/sm/mpool_sm_module.c +++ b/ompi/mca/mpool/sm/mpool_sm_module.c @@ -12,7 +12,7 @@ * Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2011-2012 Los Alamos National Security, LLC. * All rights reserved. - * Copyright (c) 2011 NVIDIA Corporation. All rights reserved. + * Copyright (c) 2011-2014 NVIDIA Corporation. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -97,7 +97,7 @@ void* mca_mpool_sm_alloc( } #if OPAL_CUDA_SUPPORT - if (flags & MCA_MPOOL_FLAGS_CUDA_REGISTER_MEM) { + if ((flags & MCA_MPOOL_FLAGS_CUDA_REGISTER_MEM) && (NULL != mseg.mbs_start_addr)) { mca_common_cuda_register(mseg.mbs_start_addr, size, mpool->mpool_component->mpool_version.mca_component_name); }