summaryrefslogtreecommitdiffstats
path: root/java/jdk13/files/patch-os_linux.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'java/jdk13/files/patch-os_linux.hpp')
-rw-r--r--java/jdk13/files/patch-os_linux.hpp22
1 files changed, 22 insertions, 0 deletions
diff --git a/java/jdk13/files/patch-os_linux.hpp b/java/jdk13/files/patch-os_linux.hpp
new file mode 100644
index 000000000..696952f18
--- /dev/null
+++ b/java/jdk13/files/patch-os_linux.hpp
@@ -0,0 +1,22 @@
+$FreeBSD: ports/java/jdk13/files/patch-os_linux.hpp,v 1.1 2004/11/28 05:29:25 glewis Exp $
+
+--- ../../hotspot1.3.1/src/os/linux/vm/os_linux.hpp 5 Jun 2002 05:27:47 -0000 1.4
++++ ../../hotspot1.3.1/src/os/linux/vm/os_linux.hpp 22 Nov 2004 17:19:42 -0000
+@@ -186,7 +186,7 @@
+ bool trylock() {
+ verify();
+ int status = os::Solaris::mutex_trylock(_mutex);
+- if (status == EBUSY)
++ if (status == EBUSY || status == EDEADLK)
+ return false;
+ assert(status == 0, "mutex_lock");
+ return true;
+@@ -348,7 +348,7 @@
+ bool trylock() {
+ verify();
+ int status = os::Solaris::mutex_trylock(_mutex);
+- if (status == EBUSY)
++ if (status == EBUSY || status == EDEADLK)
+ return false;
+ assert(status == 0, "mutex_trylock");
+ return true;