2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a689b6d276..9abab6038f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Oct  2 20:05:32 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm.c (rb_thread_mark), cont.c (cont_mark): revert r33369 and r33371
+	  that may cause SEGV in certain environments.
+
 Sun Oct 02 12:14:06 2011  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
 
 	* test/psych/test_yamldbm.rb: add test case.
diff --git a/cont.c b/cont.c
index bbcf2e184c..3e68d897ca 100644
--- a/cont.c
+++ b/cont.c
@@ -138,7 +138,7 @@ cont_mark(void *ptr)
     if (ptr) {
 	rb_context_t *cont = ptr;
 	rb_gc_mark(cont->value);
-	rb_gc_mark(cont->saved_thread.self);
+	rb_thread_mark(&cont->saved_thread);
 
 	if (cont->vm_stack) {
 #ifdef CAPTURE_JUST_VALID_VM_STACK