1.1 --- a/src/share/vm/runtime/arguments.cpp Thu Jan 24 23:30:45 2013 -0800 1.2 +++ b/src/share/vm/runtime/arguments.cpp Fri Jan 25 10:04:08 2013 -0500 1.3 @@ -2472,10 +2472,7 @@ 1.4 1.5 // -Xshare:dump 1.6 } else if (match_option(option, "-Xshare:dump", &tail)) { 1.7 -#if defined(KERNEL) 1.8 - vm_exit_during_initialization( 1.9 - "Dumping a shared archive is not supported on the Kernel JVM.", NULL); 1.10 -#elif !INCLUDE_CDS 1.11 +#if !INCLUDE_CDS 1.12 vm_exit_during_initialization( 1.13 "Dumping a shared archive is not supported in this VM.", NULL); 1.14 #else 1.15 @@ -3463,36 +3460,6 @@ 1.16 PropertyList_add(plist, k, v); 1.17 } 1.18 1.19 -#ifdef KERNEL 1.20 -char *Arguments::get_kernel_properties() { 1.21 - // Find properties starting with kernel and append them to string 1.22 - // We need to find out how long they are first because the URL's that they 1.23 - // might point to could get long. 1.24 - int length = 0; 1.25 - SystemProperty* prop; 1.26 - for (prop = _system_properties; prop != NULL; prop = prop->next()) { 1.27 - if (strncmp(prop->key(), "kernel.", 7 ) == 0) { 1.28 - length += (strlen(prop->key()) + strlen(prop->value()) + 5); // "-D =" 1.29 - } 1.30 - } 1.31 - // Add one for null terminator. 1.32 - char *props = AllocateHeap(length + 1, mtInternal); 1.33 - if (length != 0) { 1.34 - int pos = 0; 1.35 - for (prop = _system_properties; prop != NULL; prop = prop->next()) { 1.36 - if (strncmp(prop->key(), "kernel.", 7 ) == 0) { 1.37 - jio_snprintf(&props[pos], length-pos, 1.38 - "-D%s=%s ", prop->key(), prop->value()); 1.39 - pos = strlen(props); 1.40 - } 1.41 - } 1.42 - } 1.43 - // null terminate props in case of null 1.44 - props[length] = '\0'; 1.45 - return props; 1.46 -} 1.47 -#endif // KERNEL 1.48 - 1.49 // Copies src into buf, replacing "%%" with "%" and "%p" with pid 1.50 // Returns true if all of the source pointed by src has been copied over to 1.51 // the destination buffer pointed by buf. Otherwise, returns false.