From ae8c8265278438d97af5aac8590e6b21679e3706 Mon Sep 17 00:00:00 2001 From: Vasily Filipov Date: Tue, 19 Nov 2013 07:00:21 +0000 Subject: [PATCH] "If" statement wrapping with #if MEMORY_LINUX_UMMUNOTIFY in order to prevent ptmalloc2 hooks disabling in case if OMPI was not configured with ummunotify support. This commit was SVN r29720. --- opal/mca/memory/linux/hooks.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/opal/mca/memory/linux/hooks.c b/opal/mca/memory/linux/hooks.c index d2b6daf86d..0bfa123d6d 100644 --- a/opal/mca/memory/linux/hooks.c +++ b/opal/mca/memory/linux/hooks.c @@ -762,6 +762,7 @@ void opal_memory_linux_malloc_init_hook(void) return; } +#if MEMORY_LINUX_UMMUNOTIFY /* Next, check if ummunotify is present on the system. If it is, then we don't need to do the following ptmalloc2 hacks. open/mmap on the device may fail during init, but if /dev/ummunotify @@ -770,6 +771,7 @@ void opal_memory_linux_malloc_init_hook(void) if (access("/dev/ummunotify", F_OK) == 0) { return; } +#endif /* Yes, checking for an MPI MCA parameter here is an abstraction violation. Cope. Yes, even checking for *any* MCA parameter