diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-11 09:05:33 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-11 09:05:33 -0400 |
| commit | 10e299fc6d596f4e8476d24ebba1495a8355baff (patch) | |
| tree | f7517eccba4dfc223113961c64429f3986afa8eb /kernel/spinlock.c | |
| parent | cff93eb3d3244cc117a5204fe1d62102b506afb9 (diff) | |
| parent | 38f5745c5a90641079fd5b48600ae63f7ab6edcd (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'kernel/spinlock.c')
| -rw-r--r-- | kernel/spinlock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/spinlock.c b/kernel/spinlock.c index bfd6ad9c0330..fb524b009eef 100644 --- a/kernel/spinlock.c +++ b/kernel/spinlock.c @@ -72,7 +72,7 @@ EXPORT_SYMBOL(_write_trylock); * not re-enabled during lock-acquire (which the preempt-spin-ops do): */ #if !defined(CONFIG_PREEMPT) || !defined(CONFIG_SMP) || \ - defined(CONFIG_PROVE_LOCKING) + defined(CONFIG_DEBUG_LOCK_ALLOC) void __lockfunc _read_lock(rwlock_t *lock) { |