archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Dmitry Samersoff 2012-09-27 20:22:57 +04:00
commit 47a8760b93
338 changed files with 1627 additions and 20712 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hotspot/src/share/vm/runtime/arguments.cpp
View file

@ -1991,6 +1991,11 @@ bool Arguments::check_vm_args_consistency() {
}
#endif // SPARC
if (PrintNMTStatistics && MemTracker::tracking_level() == MemTracker::NMT_off) {
warning("PrintNMTStatistics is disabled, because native memory tracking is not enabled");
PrintNMTStatistics = false;
}
return status;
}