*** old/src/os/solaris/vm/os_solaris.cpp	Tue Jul  2 17:37:39 2013
--- new/src/os/solaris/vm/os_solaris.cpp	Tue Jul  2 17:37:39 2013

*** 3503,3517 ****
--- 3503,3521 ----
      return false;
    }
    return true;
  }
  
! char* os::reserve_memory_special(size_t size, size_t alignment, char* addr, bool exec) {
    // "exec" is passed in but not used.  Creating the shared image for
    // the code cache doesn't have an SHM_X executable permission to check.
    assert(UseLargePages && UseISM, "only for ISM large pages");
  
+   if (!is_size_aligned(size, os::large_page_size()) || alignment > os::large_page_size()) {
+     return NULL; // Fallback to small pages.
+   }
+ 
    char* retAddr = NULL;
    int shmid;
    key_t ismKey;
  
    bool warn_on_failure = UseISM &&

*** 6839,6843 ****
--- 6843,6853 ----
      return 0;
    }
  
    return strlen(buffer);
  }
+ 
+ #ifndef PRODUCT
+ void TestReserveMemorySpecial_test() {
+   // No tests available for this platform
+ }
+ #endif