--- old/src/hotspot/os/windows/os_windows.cpp 2017-11-03 01:09:28.596774091 -0700 +++ new/src/hotspot/os/windows/os_windows.cpp 2017-11-03 01:09:28.331776185 -0700 @@ -2914,7 +2914,7 @@ } // If 'base' is not NULL, function will return NULL if it cannot get 'base' -char* os::map_memory_to_dax_file(char* base, size_t size, int fd) { +char* os::map_memory_to_file(char* base, size_t size, int fd) { assert(fd != -1, "File descriptor is not valid"); HANDLE fh = (HANDLE)_get_osfhandle(fd); @@ -2938,12 +2938,12 @@ return (char*)addr; } -char* os::replace_existing_mapping_with_dax_file_mapping(char* base, size_t size, int fd) { +char* os::replace_existing_mapping_with_file_mapping(char* base, size_t size, int fd) { assert(fd != -1, "File descriptor is not valid"); assert(base != NULL, "Base address cannot be NULL"); release_memory(base, size); - return map_memory_to_dax_file(base, size, fd); + return map_memory_to_file(base, size, fd); } // On win32, one cannot release just a part of reserved memory, it's an @@ -3037,7 +3037,7 @@ char* os::pd_attempt_reserve_memory_at(size_t bytes, char* requested_addr, int file_desc) { assert(file_desc >= 0, "file_desc is not valid"); - return map_memory_to_dax_file(requested_addr, bytes, file_desc); + return map_memory_to_file(requested_addr, bytes, file_desc); } size_t os::large_page_size() {