diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-06 22:39:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-06 22:39:31 -0400 |
| commit | 69259abb64d4da77273bf59accfc9fa79e7165f4 (patch) | |
| tree | bd043ab03a788b749c8d5ae4049d8defae9abf34 /include/linux/lglock.h | |
| parent | dd53df265b1ee7a1fbbc76bb62c3bec2383bbd44 (diff) | |
| parent | 12e94471b2be5ef9b55b10004a3a2cd819490036 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/pcmcia/pcnet_cs.c
net/caif/caif_socket.c
Diffstat (limited to 'include/linux/lglock.h')
| -rw-r--r-- | include/linux/lglock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/lglock.h b/include/linux/lglock.h index b288cb713b90..f549056fb20b 100644 --- a/include/linux/lglock.h +++ b/include/linux/lglock.h | |||
| @@ -150,7 +150,7 @@ | |||
| 150 | int i; \ | 150 | int i; \ |
| 151 | preempt_disable(); \ | 151 | preempt_disable(); \ |
| 152 | rwlock_acquire(&name##_lock_dep_map, 0, 0, _RET_IP_); \ | 152 | rwlock_acquire(&name##_lock_dep_map, 0, 0, _RET_IP_); \ |
| 153 | for_each_online_cpu(i) { \ | 153 | for_each_possible_cpu(i) { \ |
| 154 | arch_spinlock_t *lock; \ | 154 | arch_spinlock_t *lock; \ |
| 155 | lock = &per_cpu(name##_lock, i); \ | 155 | lock = &per_cpu(name##_lock, i); \ |
| 156 | arch_spin_lock(lock); \ | 156 | arch_spin_lock(lock); \ |
| @@ -161,7 +161,7 @@ | |||
| 161 | void name##_global_unlock(void) { \ | 161 | void name##_global_unlock(void) { \ |
| 162 | int i; \ | 162 | int i; \ |
| 163 | rwlock_release(&name##_lock_dep_map, 1, _RET_IP_); \ | 163 | rwlock_release(&name##_lock_dep_map, 1, _RET_IP_); \ |
| 164 | for_each_online_cpu(i) { \ | 164 | for_each_possible_cpu(i) { \ |
| 165 | arch_spinlock_t *lock; \ | 165 | arch_spinlock_t *lock; \ |
| 166 | lock = &per_cpu(name##_lock, i); \ | 166 | lock = &per_cpu(name##_lock, i); \ |
| 167 | arch_spin_unlock(lock); \ | 167 | arch_spin_unlock(lock); \ |