diff --git a/oshmem/mca/sshmem/base/base.h b/oshmem/mca/sshmem/base/base.h index c980e5d7c3..513f3596ba 100644 --- a/oshmem/mca/sshmem/base/base.h +++ b/oshmem/mca/sshmem/base/base.h @@ -160,7 +160,7 @@ static inline char * oshmem_get_unique_file_name(uint64_t pe) return NULL; } - snprintf(file_name, OPAL_PATH_MAX, "%s/shmem_job_%u_pe_%llu", mca_sshmem_base_backing_file_dir, ORTE_PROC_MY_NAME->jobid, pe); + snprintf(file_name, OPAL_PATH_MAX, "%s/shmem_job_%u_pe_%llu", mca_sshmem_base_backing_file_dir, ORTE_PROC_MY_NAME->jobid, (unsigned long long)pe); return file_name; } diff --git a/oshmem/mca/sshmem/mmap/sshmem_mmap_component.c b/oshmem/mca/sshmem/mmap/sshmem_mmap_component.c index dbb46e0f23..e595ee8963 100644 --- a/oshmem/mca/sshmem/mmap/sshmem_mmap_component.c +++ b/oshmem/mca/sshmem/mmap/sshmem_mmap_component.c @@ -110,7 +110,7 @@ mmap_register(void) "anonymous", "Select whether anonymous sshmem is used for mmap " "component (default: 1)", MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE, - OPAL_INFO_LVL_3, + OPAL_INFO_LVL_4, MCA_BASE_VAR_SCOPE_ALL_EQ, &mca_sshmem_mmap_component.is_anonymous); @@ -119,7 +119,7 @@ mmap_register(void) "fixed", "Select whether fixed start address is used for shmem " "(default: 1)", MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE, - OPAL_INFO_LVL_3, + OPAL_INFO_LVL_4, MCA_BASE_VAR_SCOPE_ALL_EQ, &mca_sshmem_mmap_component.is_start_addr_fixed); return OSHMEM_SUCCESS; diff --git a/oshmem/mca/sshmem/mmap/sshmem_mmap_module.c b/oshmem/mca/sshmem/mmap/sshmem_mmap_module.c index 8fe87d3912..6281cc90d4 100644 --- a/oshmem/mca/sshmem/mmap/sshmem_mmap_module.c +++ b/oshmem/mca/sshmem/mmap/sshmem_mmap_module.c @@ -49,6 +49,10 @@ #include "sshmem_mmap.h" +#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON) +# define MAP_ANONYMOUS MAP_ANON +#endif /* MAP_ANONYMOUS and MAP_ANON */ + #if !defined(MAP_FAILED) # define MAP_FAILED ((char*)-1) #endif /* MAP_FAILED */