X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStorage.h;h=1f6ef3f5e736382eddafcf296aa328108a20ed19;hb=03a9ff01812afc81eb5236fd3063cbec44cf469e;hp=ce944c8a7af7efe0cdd129b4e04fef2a908c2966;hpb=63e8af080a7e779a48e812e6caa9ea519b046260;p=ghc-hetmet.git diff --git a/ghc/includes/Storage.h b/ghc/includes/Storage.h index ce944c8..1f6ef3f 100644 --- a/ghc/includes/Storage.h +++ b/ghc/includes/Storage.h @@ -145,7 +145,7 @@ extern void exitStorage(void); -------------------------------------------------------------------------- */ extern StgPtr allocate ( nat n ); -extern StgPtr allocateLocal ( StgRegTable *reg, nat n ); +extern StgPtr allocateLocal ( Capability *cap, nat n ); extern StgPtr allocatePinned ( nat n ); extern lnat allocated_bytes ( void ); @@ -205,9 +205,11 @@ extern Mutex sm_mutex; #if defined(SMP) #define ACQUIRE_SM_LOCK ACQUIRE_LOCK(&sm_mutex); #define RELEASE_SM_LOCK RELEASE_LOCK(&sm_mutex); +#define ASSERT_SM_LOCK() ASSERT_LOCK_HELD(&sm_mutex); #else #define ACQUIRE_SM_LOCK #define RELEASE_SM_LOCK +#define ASSERT_SM_LOCK() #endif INLINE_HEADER void