*** old/src/share/vm/memory/metaspace.hpp	Tue Dec 18 10:45:52 2012
--- new/src/share/vm/memory/metaspace.hpp	Tue Dec 18 10:45:52 2012

*** 154,173 ****
--- 154,182 ----
    static size_t free_chunks_total(Metaspace::MetadataType mdtype);
    static size_t free_chunks_total_in_bytes(Metaspace::MetadataType mdtype);
  
   public:
    // Total of space allocated to metadata in all Metaspaces
!   static size_t used_in_bytes();
!   static size_t used_in_bytes() {
+     return used_in_bytes(Metaspace::ClassType) +
+            used_in_bytes(Metaspace::NonClassType);
+   }
  
    // Total of available space in all Metaspaces
    // Total of capacity allocated to all Metaspaces.  This includes
    // space in Metachunks not yet allocated and in the Metachunk
    // freelist.
!   static size_t capacity_in_bytes();
!   static size_t capacity_in_bytes() {
+     return capacity_in_bytes(Metaspace::ClassType) +
+            capacity_in_bytes(Metaspace::NonClassType);
+   }
  
    // Total space reserved in all Metaspaces
!   static size_t reserved_in_bytes();
!   static size_t reserved_in_bytes() {
+     return reserved_in_bytes(Metaspace::ClassType) +
+            reserved_in_bytes(Metaspace::NonClassType);
+   }
  
    static size_t min_chunk_size();
  
    // Print change in used metadata.
    static void print_metaspace_change(size_t prev_metadata_used);