merges r31609 from trunk into ruby_1_9_2.

--
* vm_core.h (rb_thread_struct): add volatile to
  transition_for_lock because it is not protected by lock.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31835 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 1 deletions

diff --git a/vm_core.h b/vm_core.h
index 2c73dd7e95..0c2b3f4e52 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -427,7 +427,7 @@ typedef struct rb_thread_struct
     struct rb_unblock_callback unblock;
     VALUE locking_mutex;
     struct rb_mutex_struct *keeping_mutexes;
-    int transition_for_lock;
+    volatile int transition_for_lock;
 
     struct rb_vm_tag *tag;
     struct rb_vm_protect_tag *protect_tag;