| commit | 1abe02add0b2282b99a62e938e64fc52afe289fd | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Thu Mar 08 20:43:43 2012 -0800 |
| committer | QuIC Gerrit Code Review <code-review@localhost> | Thu Mar 08 20:43:43 2012 -0800 |
| tree | d379adac53c8983b80661856ac06ea6bf7583de7 | |
| parent | 7ef0d1ebf3f542bf6c6487f7f90e41279d21b0ad [diff] | |
| parent | 8a9e3936053600b647921b6196e667772f815857 [diff] |
Merge "arm: Turn off generic lockbreak when using ticket spinlocks" into msm-3.0
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b46d7f1..f5046dc 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -131,7 +131,7 @@ config GENERIC_LOCKBREAK bool - default y + default y if !ARM_TICKET_LOCKS depends on SMP && PREEMPT config ARM_TICKET_LOCKS