X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FStorage.c;h=b2878c2ce14f866936cb4c218eee5fe4d1fb083b;hb=ec0984a97cec59d0403ae1f23e23f100666e8148;hp=00ed711ce5a6f734e8a913c00a611e182724d76c;hpb=3f9677ec1c1d19667782f85bf0708cba60c903d5;p=ghc-hetmet.git diff --git a/ghc/rts/Storage.c b/ghc/rts/Storage.c index 00ed711..b2878c2 100644 --- a/ghc/rts/Storage.c +++ b/ghc/rts/Storage.c @@ -22,6 +22,7 @@ #include "Storage.h" #include "Schedule.h" #include "RetainerProfile.h" // for counting memory blocks (memInventory) +#include "StoragePriv.h" #include #include @@ -63,18 +64,6 @@ static void *stgAllocForGMP (size_t size_in_bytes); static void *stgReallocForGMP (void *ptr, size_t old_size, size_t new_size); static void stgDeallocForGMP (void *ptr, size_t size); -/* - * Storage manager mutex - */ -#if defined(SMP) -extern Mutex sm_mutex; -#define ACQUIRE_SM_LOCK ACQUIRE_LOCK(&sm_mutex) -#define RELEASE_SM_LOCK RELEASE_LOCK(&sm_mutex) -#else -#define ACQUIRE_SM_LOCK -#define RELEASE_SM_LOCK -#endif - static void initStep (step *stp, int g, int s) {