*** old/src/os/linux/vm/globals_linux.hpp	Sat Jun 13 09:00:21 2015
--- new/src/os/linux/vm/globals_linux.hpp	Sat Jun 13 09:00:21 2015

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 26,43 ****
--- 26,44 ----
  #define OS_LINUX_VM_GLOBALS_LINUX_HPP
  
  //
  // Defines Linux specific flags. They are not available on other platforms.
  //
! #define RUNTIME_OS_FLAGS(develop, develop_pd, product, product_pd, diagnostic, notproduct, range, constraint) \
+                                                                         \
    product(bool, UseOprofile, false,                                     \
          "enable support for Oprofile profiler")                         \
                                                                          \
+   /*  NB: The default value of UseLinuxPosixThreadCPUClocks may be   */ \
+   /* overridden in Arguments::parse_each_vm_init_arg.                */ \
    product(bool, UseLinuxPosixThreadCPUClocks, true,                     \
            "enable fast Linux Posix clocks where available")             \
  /*  NB: The default value of UseLinuxPosixThreadCPUClocks may be        \
      overridden in Arguments::parse_each_vm_init_arg.  */                \
                                                                          \
    product(bool, UseHugeTLBFS, false,                                    \
            "Use MAP_HUGETLB for large pages")                            \
                                                                          \
    product(bool, UseTransparentHugePages, false,                         \