diff -r cbe83e9c2100 -r f1bb77833b59 src/hotspot/cpu/s390/globals_s390.hpp --- a/src/hotspot/cpu/s390/globals_s390.hpp Thu Nov 08 11:22:28 2018 -0800 +++ b/src/hotspot/cpu/s390/globals_s390.hpp Thu Nov 08 11:45:13 2018 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016, 2018 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -71,8 +71,6 @@ define_pd_global(bool, RewriteBytecodes, true); define_pd_global(bool, RewriteFrequentPairs, true); -define_pd_global(bool, UseMembar, true); - define_pd_global(bool, PreserveFramePointer, false); // GC Ergo Flags