*** old/src/share/vm/runtime/globals.hpp	Mon Oct  4 17:01:01 2010
--- new/src/share/vm/runtime/globals.hpp	Mon Oct  4 17:00:59 2010

*** 321,331 ****
--- 321,331 ----
            "Default object alignment in bytes, 8 is minimum")                \
                                                                              \
    /* UseMembar is theoretically a temp flag used for memory barrier         \
     * removal testing.  It was supposed to be removed before FCS but has     \
     * been re-added (see 6401008) */                                         \
!   product(bool, UseMembar, false,                                           \
!   product_pd(bool, UseMembar,                                               \
            "(Unstable) Issues membars on thread state transitions")          \
                                                                              \
    /* Temporary: See 6948537 */                                              \
    experimental(bool, UseMemSetInBOT, true,                                  \
            "(Unstable) uses memset in BOT updates in GC code")               \