/hg/icedtea6: 2 new changesets

[aph at icedtea.classpath.org]

changeset d240889408be in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d240889408be
author: aph
date: Mon Feb 20 12:02:21 2012 +0000

	Don't use shared Eden in incremental mode. 2012-02-20 Andrew Haley
	<aph at redhat.com>

	 * arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp
	(Helper_new): Don't use shared Eden in incremental mode.


changeset 8d0e6091efad in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8d0e6091efad
author: aph
date: Mon Feb 20 15:59:31 2012 +0000

	merge ChangeLog


diffstat:

 ChangeLog                                       |  5 +++++
 arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp |  2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diffs (24 lines):

diff -r 49f9beb1f03c -r 8d0e6091efad ChangeLog
--- a/ChangeLog	Wed Feb 15 15:48:21 2012 +0000
+++ b/ChangeLog	Mon Feb 20 15:59:31 2012 +0000
@@ -1,3 +1,8 @@
+2012-02-20  Andrew Haley  <aph at redhat.com>
+
+	* arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp (Helper_new):
+	Don't use shared Eden in incremental mode.
+
 2012-02-15  Andrew John Hughes  <ahughes at redhat.com>
 
 	* NEWS: Bring in 1.8.13, 1.9.13 and 1.10.6
diff -r 49f9beb1f03c -r 8d0e6091efad arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp
--- a/arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp	Wed Feb 15 15:48:21 2012 +0000
+++ b/arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp	Mon Feb 20 15:59:31 2012 +0000
@@ -141,7 +141,7 @@
 	if (UseTLAB) {
 	  result = (oop) thread->tlab().allocate(obj_size);
 	}
-	if (result == NULL) {
+	if (result == NULL && !CMSIncrementalMode) {
 	  need_zero = true;
 	  // Try allocate in shared eden
     retry: