*** old/src/hotspot/os/linux/os_linux.hpp	Fri Oct 20 09:45:00 2017
--- new/src/hotspot/os/linux/os_linux.hpp	Fri Oct 20 09:44:59 2017

*** 30,39 ****
--- 30,40 ----
  // Information about the protection of the page at address '0' on this os.
  static bool zero_page_read_protected() { return true; }
  
  class Linux {
    friend class os;
+   friend class OSContainer;
    friend class TestReserveMemorySpecial;
  
    static bool libjsig_is_loaded;        // libjsig that interposes sigaction(),
                                          // __sigaction(), signal() is loaded
    static struct sigaction *(*get_signal_action)(int);

*** 73,82 ****
--- 74,86 ----
    static Mutex* _createThread_lock;
    static int _page_size;
  
    static julong available_memory();
    static julong physical_memory() { return _physical_memory; }
+   static void set_physical_memory(julong phys_mem) { _physical_memory = phys_mem; }
+   static int active_processor_count();
+ 
    static void initialize_system_info();
  
    static int commit_memory_impl(char* addr, size_t bytes, bool exec);
    static int commit_memory_impl(char* addr, size_t bytes,
                                  size_t alignment_hint, bool exec);

*** 104,113 ****
--- 108,118 ----
    static bool release_memory_special_impl(char* base, size_t bytes);
    static bool release_memory_special_shm(char* base, size_t bytes);
    static bool release_memory_special_huge_tlbfs(char* base, size_t bytes);
  
    static void print_full_memory_info(outputStream* st);
+   static void print_container_info(outputStream* st);
    static void print_distro_info(outputStream* st);
    static void print_libversion_info(outputStream* st);
  
   public:
    static bool _stack_is_executable;