--- old/src/hotspot/share/memory/virtualspace.hpp	2018-06-14 13:48:27.946000000 -0700
+++ new/src/hotspot/share/memory/virtualspace.hpp	2018-06-14 13:48:27.767000000 -0700
@@ -33,11 +33,7 @@
   friend class VMStructs;
  protected:
   char*  _base;
-  char*  _nvdimm_base;
-  char*  _nvdimm_base_nv;
   size_t _size;
-  size_t _dram_size;
-  size_t _nvdimm_size;
   size_t _noaccess_prefix;
   size_t _alignment;
   bool   _special;
@@ -67,11 +63,9 @@
 
   // Accessors
   char*  base()            const { return _base;      }
-  char*  nvdimm_base()     const { return _nvdimm_base; }
   int    nvdimm_fd()       const { return _fd_for_heap; }
   void   setup_fd(int fd)  {_fd_for_heap = fd; } 
   size_t size()            const { return _size;      }
-  size_t nvdimm_size()     const { return _nvdimm_size;  }
   char*  end()             const { return _base + _size; }
   size_t alignment()       const { return _alignment; }
   bool   special()         const { return _special;   }
@@ -122,7 +116,6 @@
   void initialize_compressed_heap(const size_t size, size_t alignment, bool large);
   // Create protection page at the beginning of the space.
   void establish_noaccess_prefix();
-  void initialize_g1gc_nvdimm_dram_sizes(size_t size, size_t alignment);
  public:
   // Constructor. Tries to find a heap that is good for compressed oops.
   // heap_allocation_directory is the path to the backing memory for Java heap. When set, Java heap will be allocated