diff -r c264868bff5b -r 07ad034e0c29 src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp --- a/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp Wed Oct 04 14:25:53 2017 +0200 +++ b/src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp Wed Oct 04 16:44:45 2017 +0200 @@ -1,6 +1,6 @@ /* - * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2016 SAP SE. All rights reserved. + * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017 SAP SE. 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 @@ -471,7 +471,7 @@ // Info->si_addr need not be the exact address, it is only // guaranteed to be on the same page as the address that caused // the SIGSEGV. - if ((sig == SIGSEGV) && + if ((sig == SIGSEGV) && !UseMembar && (os::get_memory_serialize_page() == (address)((uintptr_t)info->si_addr & ~(os::vm_page_size()-1)))) { return true;