diff src/os/solaris/vm/os_solaris.cpp @ 14412:e2722a66aba7

Merge
author kvn
date Thu, 05 Sep 2013 11:04:39 -0700
parents f42f2e2a1518 4c84d351cca9
children 2b8e28fdf503
line wrap: on
line diff
--- a/src/os/solaris/vm/os_solaris.cpp	Thu Aug 22 09:39:54 2013 -0700
+++ b/src/os/solaris/vm/os_solaris.cpp	Thu Sep 05 11:04:39 2013 -0700
@@ -3341,7 +3341,7 @@
   return true;
 }
 
-char* os::reserve_memory_special(size_t size, char* addr, bool exec) {
+char* os::reserve_memory_special(size_t size, size_t alignment, char* addr, bool exec) {
   fatal("os::reserve_memory_special should not be called on Solaris.");
   return NULL;
 }
@@ -6557,3 +6557,9 @@
 
   return strlen(buffer);
 }
+
+#ifndef PRODUCT
+void TestReserveMemorySpecial_test() {
+  // No tests available for this platform
+}
+#endif