# HG changeset patch
# User bpittore
# Date 1329340189 18000
# Node ID abc5aecaaf0fe8fbb4fe90a02e9080bcd71fa52b
# Parent  bf849667b2e65b698730ff4b5fb9b12d8b299f08# Parent  c80672b25b67c1faea7620978dea931f62b3184c
Merge

diff -r bf849667b2e6 -r abc5aecaaf0f hotspot/src/share/vm/memory/compactingPermGenGen.cpp
--- a/hotspot/src/share/vm/memory/compactingPermGenGen.cpp	Fri Feb 10 11:46:20 2012 -0800
+++ b/hotspot/src/share/vm/memory/compactingPermGenGen.cpp	Wed Feb 15 16:09:49 2012 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -240,9 +240,6 @@
     if (_ro_space == NULL || _rw_space == NULL)
       vm_exit_during_initialization("Could not allocate a shared space");
 
-    // Cover both shared spaces entirely with cards.
-    _rs->resize_covered_region(MemRegion(readonly_bottom, readwrite_end));
-
     if (UseSharedSpaces) {
 
       // Map in the regions in the shared file.
@@ -279,10 +276,14 @@
         delete _rw_space;
         _rw_space = NULL;
         shared_end = (HeapWord*)(rs.base() + rs.size());
-        _rs->resize_covered_region(MemRegion(shared_bottom, shared_bottom));
       }
     }
 
+    if (spec()->enable_shared_spaces()) {
+      // Cover both shared spaces entirely with cards.
+      _rs->resize_covered_region(MemRegion(readonly_bottom, readwrite_end));
+    }
+
     // Reserved region includes shared spaces for oop.is_in_reserved().
     _reserved.set_end(shared_end);