--- old/src/share/vm/gc_implementation/g1/g1ParScanThreadState.hpp	2014-09-22 08:51:59.264619077 -0700
+++ new/src/share/vm/gc_implementation/g1/g1ParScanThreadState.hpp	2014-09-22 08:51:59.148619080 -0700
@@ -84,9 +84,9 @@
   DirtyCardQueue& dirty_card_queue()             { return _dcq;  }
   G1SATBCardTableModRefBS* ctbs()                { return _ct_bs; }
 
-  template <class T> inline void immediate_rs_update(HeapRegion* from, T* p, int tid);
+  template <class T> inline void immediate_rs_update(HeapRegion* from, T* p, uint tid);
 
-  template <class T> void deferred_rs_update(HeapRegion* from, T* p, int tid) {
+  template <class T> void deferred_rs_update(HeapRegion* from, T* p, uint tid) {
     // If the new value of the field points to the same region or
     // is the to-space, we don't need to include it in the Rset updates.
     if (!from->is_in_reserved(oopDesc::load_decode_heap_oop(p)) && !from->is_survivor()) {
@@ -124,7 +124,7 @@
     _refs->push(ref);
   }
 
-  template <class T> inline void update_rs(HeapRegion* from, T* p, int tid);
+  template <class T> inline void update_rs(HeapRegion* from, T* p, uint tid);
 
  private:
 
--- old/src/share/vm/gc_implementation/g1/g1ParScanThreadState.inline.hpp	2014-09-22 08:51:59.708619065 -0700
+++ new/src/share/vm/gc_implementation/g1/g1ParScanThreadState.inline.hpp	2014-09-22 08:51:59.632619067 -0700
@@ -29,13 +29,13 @@
 #include "gc_implementation/g1/g1RemSet.inline.hpp"
 #include "oops/oop.inline.hpp"
 
-template <class T> inline void G1ParScanThreadState::immediate_rs_update(HeapRegion* from, T* p, int tid) {
+template <class T> inline void G1ParScanThreadState::immediate_rs_update(HeapRegion* from, T* p, uint tid) {
   if (!from->is_survivor()) {
     _g1_rem->par_write_ref(from, p, tid);
   }
 }
 
-template <class T> void G1ParScanThreadState::update_rs(HeapRegion* from, T* p, int tid) {
+template <class T> void G1ParScanThreadState::update_rs(HeapRegion* from, T* p, uint tid) {
   if (G1DeferredRSUpdate) {
     deferred_rs_update(from, p, tid);
   } else {
--- old/src/share/vm/gc_implementation/g1/g1RemSet.hpp	2014-09-22 08:52:00.048619056 -0700
+++ new/src/share/vm/gc_implementation/g1/g1RemSet.hpp	2014-09-22 08:51:59.952619058 -0700
@@ -119,7 +119,7 @@
   // Record, if necessary, the fact that *p (where "p" is in region "from",
   // which is required to be non-NULL) has changed to a new non-NULL value.
   template <class T> void write_ref(HeapRegion* from, T* p);
-  template <class T> void par_write_ref(HeapRegion* from, T* p, int tid);
+  template <class T> void par_write_ref(HeapRegion* from, T* p, uint tid);
 
   // Requires "region_bm" and "card_bm" to be bitmaps with 1 bit per region
   // or card, respectively, such that a region or card with a corresponding
--- old/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp	2014-09-22 08:52:00.388619047 -0700
+++ new/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp	2014-09-22 08:52:00.296619049 -0700
@@ -44,7 +44,7 @@
 }
 
 template <class T>
-inline void G1RemSet::par_write_ref(HeapRegion* from, T* p, int tid) {
+inline void G1RemSet::par_write_ref(HeapRegion* from, T* p, uint tid) {
   oop obj = oopDesc::load_decode_heap_oop(p);
   if (obj == NULL) {
     return;
--- old/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	2014-09-22 08:52:00.732619037 -0700
+++ new/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	2014-09-22 08:52:00.624619040 -0700
@@ -419,7 +419,7 @@
   FromCardCache::print();
 }
 
-void OtherRegionsTable::add_reference(OopOrNarrowOopStar from, int tid) {
+void OtherRegionsTable::add_reference(OopOrNarrowOopStar from, uint tid) {
   uint cur_hrm_ind = hr()->hrm_index();
 
   if (G1TraceHeapRegionRememberedSet) {
@@ -435,10 +435,10 @@
   if (G1TraceHeapRegionRememberedSet) {
     gclog_or_tty->print_cr("Table for [" PTR_FORMAT "...): card %d (cache = %d)",
                   hr()->bottom(), from_card,
-                  FromCardCache::at((uint)tid, cur_hrm_ind));
+                  FromCardCache::at(tid, cur_hrm_ind));
   }
 
-  if (FromCardCache::contains_or_replace((uint)tid, cur_hrm_ind, from_card)) {
+  if (FromCardCache::contains_or_replace(tid, cur_hrm_ind, from_card)) {
     if (G1TraceHeapRegionRememberedSet) {
       gclog_or_tty->print_cr("  from-card cache hit.");
     }
@@ -493,7 +493,7 @@
         return;
       } else {
         if (G1TraceHeapRegionRememberedSet) {
-          gclog_or_tty->print_cr("   [tid %d] sparse table entry "
+          gclog_or_tty->print_cr("   [tid %u] sparse table entry "
                         "overflow(f: %d, t: %u)",
                         tid, from_hrm_ind, cur_hrm_ind);
         }
--- old/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp	2014-09-22 08:52:01.100619027 -0700
+++ new/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp	2014-09-22 08:52:00.996619030 -0700
@@ -179,7 +179,7 @@
 
   // For now.  Could "expand" some tables in the future, so that this made
   // sense.
-  void add_reference(OopOrNarrowOopStar from, int tid);
+  void add_reference(OopOrNarrowOopStar from, uint tid);
 
   // Removes any entries shown by the given bitmaps to contain only dead
   // objects.
@@ -301,7 +301,7 @@
   }
 
   // Used in the parallel case.
-  void add_reference(OopOrNarrowOopStar from, int tid) {
+  void add_reference(OopOrNarrowOopStar from, uint tid) {
     _other_regions.add_reference(from, tid);
   }