--- a/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp	Fri Apr 15 10:10:50 2011 -0700
+++ b/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp	Mon Apr 18 16:27:16 2011 -0700
@@ -525,7 +525,7 @@
 
   // Is marking active?
   assert(thread()->is_register(), "precondition");
-  Register thread_reg = NOT_LP64(thread()->as_register()) LP64_ONLY(thread()->as_register_lo());
+  Register thread_reg = thread()->as_pointer_register();
 
   Address in_progress(thread_reg, in_bytes(JavaThread::satb_mark_queue_offset() +
                                        PtrQueue::byte_offset_of_active()));