aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-09 02:07:50 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-09 02:07:50 +0000
commit85cc4ff62a95500ee748f9d5d987a0003d43b4e5 (patch)
tree0533ebd9984642547c1c9876466f09ed47d9ed9c
parentf7f3f9bf76467190c34fc598fd48ebedf3db9f42 (diff)
downloadruby-85cc4ff62a95500ee748f9d5d987a0003d43b4e5.tar.gz
* cont.c (cont_memsize): fixed wrong expression on IA64.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24800 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--cont.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f5ef8bb432..36dbcb07eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Sep 9 11:07:48 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * cont.c (cont_memsize): fixed wrong expression on IA64.
+
Wed Sep 9 10:51:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* cont.c (cont_restore_1, rb_cont_call): should be Fiber.
diff --git a/cont.c b/cont.c
index 10a8df1754..8fd9d89e64 100644
--- a/cont.c
+++ b/cont.c
@@ -148,8 +148,7 @@ cont_memsize(void *ptr)
}
#ifdef __ia64
if (cont->machine_register_stack) {
- size += (cont->machine_register_stack + cont->machine_register_stack_size) *
- sizeof(*cont->machine_register_stack);
+ size += cont->machine_register_stack_size * sizeof(*cont->machine_register_stack);
}
#endif
}