diff --git a/ChangeLog b/ChangeLog
index dbd25ec42f..6c7cac6661 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Sat Jul 14 16:11:24 2007  Tanaka Akira  <akr@fsij.org>
+Sat Jul 14 18:46:35 2007  Tanaka Akira  <akr@fsij.org>
 
 	* configure.in: add --with-valgrind.
 
@@ -9,7 +9,7 @@ Sat Jul 14 16:11:24 2007  Tanaka Akira  <akr@fsij.org>
 	* thread.c (rb_gc_set_stack_end): don't define if asm-version
 	  SET_MACHINE_STACK_END is available.
 
-	* gc.c (mark_current_thread): extracted from garbage_collect.
+	* gc.c (mark_current_machine_context): extracted from garbage_collect.
 	  it use SET_MACHINE_STACK_END to not scan out of stack area.
 	  it notify conservative GC information to valgrind if
 	  --with-valgrind.
diff --git a/gc.c b/gc.c
index 3270e2b091..737344ab9c 100644
--- a/gc.c
+++ b/gc.c
@@ -1377,7 +1377,7 @@ int rb_setjmp (rb_jmp_buf);
 void rb_vm_mark(void *ptr);
 
 static void
-mark_current_thread(rb_thread_t *th)
+mark_current_machine_context(rb_thread_t *th)
 {
     jmp_buf save_regs_gc_mark;
     VALUE *stack_start, *stack_end;
@@ -1470,7 +1470,7 @@ garbage_collect(void)
 	mark_tbl(finalizer_table, 0);
     }
 
-    mark_current_thread(th);
+    mark_current_machine_context(th);
 
     rb_gc_mark_threads();
     rb_gc_mark_symbols();