[commit: ghc] wip/erikd/rts: wip (384439f)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/erikd/rts
Link       : http://ghc.haskell.org/trac/ghc/changeset/384439fab5ced4c884cb77019d75e1c36de2008a/ghc

>---------------------------------------------------------------

commit 384439fab5ced4c884cb77019d75e1c36de2008a
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Fri Jul 1 20:21:26 2016 +1000

    wip


>---------------------------------------------------------------

384439fab5ced4c884cb77019d75e1c36de2008a
 rts/posix/OSMem.c     | 9 ++++-----
 rts/posix/OSThreads.c | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c
index f2177b4..7865623 100644
--- a/rts/posix/OSMem.c
+++ b/rts/posix/OSMem.c
@@ -10,7 +10,6 @@
 // #include "PosixSource.h"
 
 #include "Rts.h"
-
 #include "RtsUtils.h"
 #include "sm/OSMem.h"
 #include "sm/HeapAlloc.h"
@@ -306,7 +305,7 @@ void osBindMBlocksToNode(
     StgWord size STG_UNUSED,
     uint32_t node STG_UNUSED)
 {
-#if HAVE_LIBNUMA
+#if USE_LIBNUMA
     int ret;
     StgWord mask = 0;
     mask |= 1 << node;
@@ -564,7 +563,7 @@ void osReleaseHeapMemory(void)
 
 rtsBool osNumaAvailable(void)
 {
-#if HAVE_LIBNUMA
+#if USE_LIBNUMA
     return (numa_available() != -1);
 #else
     return rtsFalse;
@@ -573,7 +572,7 @@ rtsBool osNumaAvailable(void)
 
 uint32_t osNumaNodes(void)
 {
-#if HAVE_LIBNUMA
+#if USE_LIBNUMA
     return numa_num_configured_nodes();
 #else
     return 1;
@@ -582,7 +581,7 @@ uint32_t osNumaNodes(void)
 
 StgWord osNumaMask(void)
 {
-#if HAVE_LIBNUMA
+#if USE_LIBNUMA
     struct bitmask *mask;
     mask = numa_get_mems_allowed();
     if (mask->size > sizeof(StgWord)*8) {
diff --git a/rts/posix/OSThreads.c b/rts/posix/OSThreads.c
index f0444b7..04658e1 100644
--- a/rts/posix/OSThreads.c
+++ b/rts/posix/OSThreads.c
@@ -325,7 +325,7 @@ setThreadAffinity (uint32_t n STG_UNUSED,
 }
 #endif
 
-#if HAVE_LIBNUMA
+#if USE_LIBNUMA
 void setThreadNode (uint32_t node)
 {
     if (numa_run_on_node(node) == -1) {