commit b2ced52124d75bba556712c819d295fe5dbb4edf
author Linux Build Service Account <lnxbuild@localhost> Wed Mar 06 11:11:23 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Mar 06 11:11:22 2013 -0800
tree f4fefa18de6a77f7746554f77e964b1c2aae5dde
parent c5fd9beee5af761614050830316c72fb7c039d2f
parent d36eae653a33f6b27f898e365af1edbd418ccdd1

Merge "msm: remote_spinlock: implement sfpb trylock"

arch/arm/mach-msm/remote_spinlock.c

diff --git a/arch/arm/mach-msm/remote_spinlock.c b/arch/arm/mach-msm/remote_spinlock.c
index 86b068c..94923a0 100644
--- a/arch/arm/mach-msm/remote_spinlock.c
+++ b/arch/arm/mach-msm/remote_spinlock.c
@@ -343,7 +343,9 @@
 
 static int __raw_remote_sfpb_spin_trylock(raw_remote_spinlock_t *lock)
 {
-	return 1;
+	writel_relaxed(SPINLOCK_PID_APPS, lock);
+	smp_mb();
+	return readl_relaxed(lock) == SPINLOCK_PID_APPS;
 }
 
 static void __raw_remote_sfpb_spin_unlock(raw_remote_spinlock_t *lock)