*** old/src/hotspot/share/runtime/os.hpp	Wed Oct 11 14:35:00 2017
--- new/src/hotspot/share/runtime/os.hpp	Wed Oct 11 14:34:59 2017

*** 140,159 ****
--- 140,175 ----
    // Get summary strings for system information in buffer provided
    static void  get_summary_cpu_info(char* buf, size_t buflen);
    static void  get_summary_os_info(char* buf, size_t buflen);
  
    static void initialize_initial_active_processor_count();
+ 
+ #ifdef LINUX
+   // Container support is currently limited to Linux
+   static void pd_initialize_container_support();
+ #endif
+ 
   public:
    static void init(void);                      // Called before command line parsing
    static void init_before_ergo(void);          // Called after command line parsing
                                                 // before VM ergonomics processing.
    static jint init_2(void);                    // Called after command line parsing
                                                 // and VM ergonomics processing
    static void init_globals(void) {             // Called from init_globals() in init.cpp
      init_globals_ext();
    }
  
+ #ifdef LINUX
+   // Container support is currently limited to Linux
+   static void initialize_container_support() {
+     pd_initialize_container_support();
+   }
+ #else
+   static void initialize_container_support() {}
+ #endif
+ 
+ 
    // File names are case-insensitive on windows only
    // Override me as needed
    static int    file_name_strcmp(const char* s1, const char* s2);
  
    // unset environment variable