From fd970bdf2e481eec6dda5f6b7ff12068f19b50f5 Mon Sep 17 00:00:00 2001 From: Jake Moilanen Date: Sun, 1 May 2005 08:58:47 -0700 Subject: [PATCH] --- yaml --- r: 663 b: refs/heads/master c: d637413f3f05b41f678f8004225b33b62274183f h: refs/heads/master i: 661: ead987b1bc02442fe31da47950a83fd5dddfff46 659: ef9885638a930973e60a6108a625f87bc44ebde7 655: fe3aed1890b59e4aa337f8f49c4543431fa81ba1 v: v3 --- [refs] | 2 +- trunk/include/asm-ppc64/spinlock.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 00ea6648bf82..b56cbba6b625 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d59dd4620fb8d6422555a9e2b82a707718e68327 +refs/heads/master: d637413f3f05b41f678f8004225b33b62274183f diff --git a/trunk/include/asm-ppc64/spinlock.h b/trunk/include/asm-ppc64/spinlock.h index a9b2a1162cf7..acd11564dd75 100644 --- a/trunk/include/asm-ppc64/spinlock.h +++ b/trunk/include/asm-ppc64/spinlock.h @@ -110,7 +110,7 @@ static void __inline__ _raw_spin_lock(spinlock_t *lock) HMT_low(); if (SHARED_PROCESSOR) __spin_yield(lock); - } while (likely(lock->lock != 0)); + } while (unlikely(lock->lock != 0)); HMT_medium(); } } @@ -128,7 +128,7 @@ static void __inline__ _raw_spin_lock_flags(spinlock_t *lock, unsigned long flag HMT_low(); if (SHARED_PROCESSOR) __spin_yield(lock); - } while (likely(lock->lock != 0)); + } while (unlikely(lock->lock != 0)); HMT_medium(); local_irq_restore(flags_dis); } @@ -194,7 +194,7 @@ static void __inline__ _raw_read_lock(rwlock_t *rw) HMT_low(); if (SHARED_PROCESSOR) __rw_yield(rw); - } while (likely(rw->lock < 0)); + } while (unlikely(rw->lock < 0)); HMT_medium(); } } @@ -251,7 +251,7 @@ static void __inline__ _raw_write_lock(rwlock_t *rw) HMT_low(); if (SHARED_PROCESSOR) __rw_yield(rw); - } while (likely(rw->lock != 0)); + } while (unlikely(rw->lock != 0)); HMT_medium(); } }