Include pinned memory in the stats for allocated memory

This broke with the changes to the pinned object handling in
67f4ab7e.

MERGED from commit c19f2e32

rts/sm/GC.c

@@ -288,7 +288,7 @@ GarbageCollect (rtsBool force_major_gc,
 
   // gather blocks allocated using allocatePinned() from each capability
   // and put them on the g0->large_object list.
-  collect_pinned_object_blocks();
+  allocated += collect_pinned_object_blocks();
 
   // Initialise all the generations/steps that we're collecting.
   for (g = 0; g <= N; g++) {

rts/sm/Storage.c

@@ -764,6 +764,7 @@ allocatePinned (Capability *cap, W_ n)
         // g0->large_objects.
         if (bd != NULL) {
             dbl_link_onto(bd, &cap->pinned_object_blocks);
+            cap->total_allocated += bd->free - bd->start;
         }
 
         // We need to find another block.  We could just allocate one,