diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-25 00:40:04 -0500 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-25 00:40:04 -0500 |
commit | 062d967530eeddee73e18628cec89644cbc8c5c9 (patch) | |
tree | 24458f72760effe581b3b90fd503d0f9b783cafd | |
parent | 1ddee070a89ada4ab01b829cd2cf3835c8fea83b (diff) | |
parent | f35d027d525492302ce91861d94647b8dd290a33 (diff) | |
download | rt-patches-062d967530eeddee73e18628cec89644cbc8c5c9.tar.gz |
Merge branch 'v2.6.33-rt'
-rw-r--r-- | powerpc-OF-convert-to-raw-lock.patch (renamed from powerpc-OF-convert-to-atomic-lock.patch) | 6 | ||||
-rw-r--r-- | series | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/powerpc-OF-convert-to-atomic-lock.patch b/powerpc-OF-convert-to-raw-lock.patch index 5996161..ad69b19 100644 --- a/powerpc-OF-convert-to-atomic-lock.patch +++ b/powerpc-OF-convert-to-raw-lock.patch @@ -1,12 +1,12 @@ From 84357065711ac005fa6b7f8b261613c7b80bcb4d Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Wed, 29 Jul 2009 13:59:43 +0200 -Subject: [PATCH] powerpc: OF convert to atomic lock +Subject: [PATCH] powerpc: OF convert to raw lock commit 5b659531c96943c3eea21b3dbcb83e6320d0f46b in tip. -Replaced the RW lock for now with atomic_spinlock. We have no -atomic_rwlocks in -rt right now and I doubt that the OF path is +Replaced the RW lock for now with raw_spinlock. We have no +raw_rwlocks in -rt right now and I doubt that the OF path is performance critical. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> @@ -121,7 +121,7 @@ ARM-OMAP-remove-unnecessary-locking-in-clk_get_rate.patch ARM-AT91-Use-edge-irq-for-AT91-GPIO.patch powerpc-Annotate-atomic_locks.patch powerpc-Disable-preemption-across-hypervisor-call.patch -powerpc-OF-convert-to-atomic-lock.patch +powerpc-OF-convert-to-raw-lock.patch powerpc-kprobes-Fix-missed-preemption-check.patch locks-provide-__DEFINE_SPINLOCK-needed-by-percpu_loc.patch sched-revert-schedule-__schedule-changes.patch |