diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 02:35:40 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 02:35:40 -0400 |
| commit | 429b022af41108f6942d72547592b1d30e9a51f0 (patch) | |
| tree | 7d68355529718018cdad1241285816c6f64620b2 /include/linux/rcuclassic.h | |
| parent | 0cd418ddb1ee88df7d16d5df06cb2da68eceb9e4 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge commit 'v2.6.27-rc6' into core/rcu
Diffstat (limited to 'include/linux/rcuclassic.h')
| -rw-r--r-- | include/linux/rcuclassic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/rcuclassic.h b/include/linux/rcuclassic.h index 16589958b40e..29bf528c7dcc 100644 --- a/include/linux/rcuclassic.h +++ b/include/linux/rcuclassic.h | |||
| @@ -128,7 +128,7 @@ extern int rcu_needs_cpu(int cpu); | |||
| 128 | #ifdef CONFIG_DEBUG_LOCK_ALLOC | 128 | #ifdef CONFIG_DEBUG_LOCK_ALLOC |
| 129 | extern struct lockdep_map rcu_lock_map; | 129 | extern struct lockdep_map rcu_lock_map; |
| 130 | # define rcu_read_acquire() \ | 130 | # define rcu_read_acquire() \ |
| 131 | lock_acquire(&rcu_lock_map, 0, 0, 2, 1, _THIS_IP_) | 131 | lock_acquire(&rcu_lock_map, 0, 0, 2, 1, NULL, _THIS_IP_) |
| 132 | # define rcu_read_release() lock_release(&rcu_lock_map, 1, _THIS_IP_) | 132 | # define rcu_read_release() lock_release(&rcu_lock_map, 1, _THIS_IP_) |
| 133 | #else | 133 | #else |
| 134 | # define rcu_read_acquire() do { } while (0) | 134 | # define rcu_read_acquire() do { } while (0) |