diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 72a075da3ee1..ebef09f23efc 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-12  Andrew Haley  <aph@redhat.com>
+
+	* sun/misc/natUnsafe.cc (spinlock contructor): Call sched_yield().
+
 2009-01-11  Matthias Klose  <doko@ubuntu.com>
 
 	* Makefile.am (ecjx_LDADD): Add $(extra_ldflags).
diff --git a/libjava/sun/misc/natUnsafe.cc b/libjava/sun/misc/natUnsafe.cc
index cc57dd598894..0bd2d21eac55 100644
--- a/libjava/sun/misc/natUnsafe.cc
+++ b/libjava/sun/misc/natUnsafe.cc
@@ -1,6 +1,6 @@
 // natUnsafe.cc - Implementation of sun.misc.Unsafe native methods.
 
-/* Copyright (C) 2006
+/* Copyright (C) 2006, 2007
    Free Software Foundation
 
    This file is part of libgcj.
@@ -32,7 +32,7 @@ public:
 spinlock ()
   {
     while (! compare_and_swap (&lock, 0, 1))
-      ;
+      _Jv_ThreadYield ();
   }
   ~spinlock ()
   {