X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FSTM.c;h=f9c814f0e06f9431ee9cc4c4f5c72233ecb95bc8;hp=6bf20f96f23002571cd567ce5c50a80bcc4e66ba;hb=2eb04ca0f8d0ec72b417cddc60672c696b4a3daa;hpb=9cef40bd4dd2536c7a370a1a9b78461c152805cc

diff --git a/rts/STM.c b/rts/STM.c
index 6bf20f9..f9c814f 100644
--- a/rts/STM.c
+++ b/rts/STM.c
@@ -86,10 +86,10 @@
 #include "Rts.h"
 #include "RtsFlags.h"
 #include "RtsUtils.h"
+#include "Storage.h"
 #include "Schedule.h"
 #include "SMP.h"
 #include "STM.h"
-#include "Storage.h"
 #include "Trace.h"
 
 #include <stdlib.h>
@@ -906,7 +906,7 @@ static volatile StgBool token_locked = FALSE;
 static void getTokenBatch(Capability *cap) {
   while (cas((void *)&token_locked, FALSE, TRUE) == TRUE) { /* nothing */ }
   max_commits += TOKEN_BATCH_SIZE;
-  TRACE("%p : cap got token batch, max_commits=%lld", cap, max_commits);
+  TRACE("%p : cap got token batch, max_commits=%" FMT_Int64, cap, max_commits);
   cap -> transaction_tokens = TOKEN_BATCH_SIZE;
   token_locked = FALSE;
 }