Skip to content
This repository was archived by the owner on Aug 27, 2022. It is now read-only.
/ lanai Public archive

Commit 06cea10

Browse files
committedJun 25, 2020
8248271: linux-x86-zero build failure
Reviewed-by: dholmes
1 parent 233cac3 commit 06cea10

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed
 

‎src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp

+14-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
33
* Copyright 2007, 2008, 2010, 2018, Red Hat, Inc.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -34,6 +34,19 @@
3434
// Note: Currently only used in 64 bit Windows implementations
3535
static bool register_code_area(char *low, char *high) { return true; }
3636

37+
/*
38+
* Work-around for broken NX emulation using CS limit, Red Hat patch "Exec-Shield"
39+
* (IA32 only).
40+
*
41+
* Map and execute at a high VA to prevent CS lazy updates race with SMP MM
42+
* invalidation.Further code generation by the JVM will no longer cause CS limit
43+
* updates.
44+
*
45+
* Affects IA32: RHEL 5 & 6, Ubuntu 10.04 (LTS), 10.10, 11.04, 11.10, 12.04.
46+
* @see JDK-8023956
47+
*/
48+
static void workaround_expand_exec_shield_cs_limit();
49+
3750
// Atomically copy 64 bits of data
3851
static void atomic_copy64(const volatile void *src, volatile void *dst) {
3952
#if defined(PPC32) && !defined(__SPE__)

0 commit comments

Comments
 (0)