diff src/os/linux/vm/os_linux.inline.hpp @ 6275:957c266d8bc5

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Tue, 21 Aug 2012 10:39:19 +0200
parents d2a62e0f25eb
children b9a9ed0f8eeb
line wrap: on
line diff
--- a/src/os/linux/vm/os_linux.inline.hpp	Mon Aug 20 15:21:31 2012 +0200
+++ b/src/os/linux/vm/os_linux.inline.hpp	Tue Aug 21 10:39:19 2012 +0200
@@ -99,7 +99,7 @@
 
 
 // On Linux, reservations are made on a page by page basis, nothing to do.
-inline void os::split_reserved_memory(char *base, size_t size,
+inline void os::pd_split_reserved_memory(char *base, size_t size,
                                       size_t split, bool realloc) {
 }