merges r20969 from trunk into ruby_1_9_1.

* vm.c (invoke_block_from_c): fix to point right cfp.
* vm.c (vm_make_proc, vm_make_proc_from_block), vm_core.h:
  remove unused parameter cfp.
* vm_insnhelper.c, proc.c (proc_new): ditto.

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

1 files changed, 1 insertions, 1 deletions

diff --git a/proc.c b/proc.c
index c732917fd8..7e6ab16c81 100644
--- a/proc.c
+++ b/proc.c
@@ -384,7 +384,7 @@ proc_new(VALUE klass, int is_lambda)
 	return procval;
     }
 
-    procval = vm_make_proc(th, cfp, block, klass);
+    procval = vm_make_proc(th, block, klass);
 
     if (is_lambda) {
 	rb_proc_t *proc;