hg: hsx/hotspot-main/hotspot: 3 new changesets

[jon.masamitsu at oracle.com]

Changeset: 20bfb6d15a94
Author:    iveresov
Date:      2011-12-27 16:43 -0800
URL:       http://hg.openjdk.java.net/hsx/hotspot-main/hotspot/rev/20bfb6d15a94

7124829: NUMA: memory leak on Linux with large pages
Summary: In os::free_memory() use mmap with the same attributes as for the heap space
Reviewed-by: kvn
Contributed-by: Aleksey Ignatenko <aleksey.v.ignatenko at intel.com>

! src/os/bsd/vm/os_bsd.cpp
! src/os/linux/vm/os_linux.cpp
! src/os/solaris/vm/os_solaris.cpp
! src/os/windows/vm/os_windows.cpp
! src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp
! src/share/vm/gc_implementation/shared/mutableSpace.cpp
! src/share/vm/runtime/os.hpp

Changeset: 776173fc2df9
Author:    stefank
Date:      2011-12-29 07:37 +0100
URL:       http://hg.openjdk.java.net/hsx/hotspot-main/hotspot/rev/776173fc2df9

7125516: G1: ~ConcurrentMark() frees incorrectly
Summary: Replaced the code with a ShouldNotReachHere
Reviewed-by: tonyp, jmasa

! src/share/vm/gc_implementation/g1/concurrentMark.cpp

Changeset: 5ee33ff9b1c4
Author:    jmasa
Date:      2012-01-03 10:22 -0800
URL:       http://hg.openjdk.java.net/hsx/hotspot-main/hotspot/rev/5ee33ff9b1c4

Merge