diff --git a/ChangeLog b/ChangeLog
index bd24f93996..f79f0df7a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 18 21:32:02 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* vm.c, vm_core.h (rb_vm_stack_to_heap): remove const.
+	  It makes compilations warnings.
+
 Sat Jun 18 18:54:15 2011  Koichi Sasada  <ko1@atdot.net>
 
 	* vm.c, vm_core.h (rb_vm_stack_to_heap): fix "const" place.
diff --git a/vm.c b/vm.c
index 31172aa2f6..e69d0db56a 100644
--- a/vm.c
+++ b/vm.c
@@ -478,7 +478,7 @@ rb_vm_make_env_object(rb_thread_t * th, rb_control_frame_t *cfp)
 }
 
 void
-rb_vm_stack_to_heap(const rb_thread_t *th)
+rb_vm_stack_to_heap(rb_thread_t *th)
 {
     rb_control_frame_t *cfp = th->cfp;
     while ((cfp = rb_vm_get_ruby_level_next_cfp(th, cfp)) != 0) {
diff --git a/vm_core.h b/vm_core.h
index cdbf517300..ea58f3b17f 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -660,7 +660,7 @@ int rb_backtrace_each(rb_backtrace_iter_func *iter, void *arg);
 rb_control_frame_t *rb_vm_get_ruby_level_next_cfp(rb_thread_t *th, rb_control_frame_t *cfp);
 int rb_vm_get_sourceline(const rb_control_frame_t *);
 VALUE rb_name_err_mesg_new(VALUE obj, VALUE mesg, VALUE recv, VALUE method);
-void rb_vm_stack_to_heap(const rb_thread_t *th);
+void rb_vm_stack_to_heap(rb_thread_t *th);
 void ruby_thread_init_stack(rb_thread_t *th);
 
 NOINLINE(void rb_gc_save_machine_context(rb_thread_t *));