Merge with /home/shaggy/git/linus-clean/

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c
index c8bb8cc899d7..d8b6bb419d49 100644
--- a/lib/spinlock_debug.c
+++ b/lib/spinlock_debug.c
@@ -72,9 +72,9 @@ static void __spin_lock_debug(spinlock_t *lock)
 
         for (;;) {
                 for (i = 0; i < loops_per_jiffy * HZ; i++) {
-                        cpu_relax();
                         if (__raw_spin_trylock(&lock->raw_lock))
                                 return;
+                        __delay(1);
                 }
                 /* lockup suspected: */
                 if (print_once) {
@@ -144,9 +144,9 @@ static void __read_lock_debug(rwlock_t *lock)
 
         for (;;) {
                 for (i = 0; i < loops_per_jiffy * HZ; i++) {
-                        cpu_relax();
                         if (__raw_read_trylock(&lock->raw_lock))
                                 return;
+                        __delay(1);
                 }
                 /* lockup suspected: */
                 if (print_once) {
@@ -217,9 +217,9 @@ static void __write_lock_debug(rwlock_t *lock)
 
         for (;;) {
                 for (i = 0; i < loops_per_jiffy * HZ; i++) {
-                        cpu_relax();
                         if (__raw_write_trylock(&lock->raw_lock))
                                 return;
+                        __delay(1);
                 }
                 /* lockup suspected: */
                 if (print_once) {