Merge

Fri, 08 May 2009 19:50:32 -0700

author
trims
date
Fri, 08 May 2009 19:50:32 -0700
changeset 1197
7e1dbef51011
parent 1195
fede134842ab
parent 1196
622212a69394
child 1199
07c1c01e0315

Merge

     1.1 --- a/src/os/linux/vm/os_linux.cpp	Thu May 07 21:35:30 2009 -0700
     1.2 +++ b/src/os/linux/vm/os_linux.cpp	Fri May 08 19:50:32 2009 -0700
     1.3 @@ -2314,7 +2314,8 @@
     1.4  void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { }
     1.5  
     1.6  void os::free_memory(char *addr, size_t bytes) {
     1.7 -  uncommit_memory(addr, bytes);
     1.8 +  ::mmap(addr, bytes, PROT_READ | PROT_WRITE,
     1.9 +         MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0);
    1.10  }
    1.11  
    1.12  void os::numa_make_global(char *addr, size_t bytes) {

mercurial