diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 08:39:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 08:39:09 -0400 |
| commit | d2f6409584e2c62ffad81690562330ff3bf4a458 (patch) | |
| tree | 3bdfb97d0b51be2f7f414f2107e97603c1206abb /arch/ppc/lib/locks.c | |
| parent | e1b09eba2686eca94a3a188042b518df6044a3c1 (diff) | |
| parent | 4a89a04f1ee21a7c1f4413f1ad7dcfac50ff9b63 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/ppc/lib/locks.c')
| -rw-r--r-- | arch/ppc/lib/locks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/lib/locks.c b/arch/ppc/lib/locks.c index 694163d696d8..c450dc4b766e 100644 --- a/arch/ppc/lib/locks.c +++ b/arch/ppc/lib/locks.c | |||
| @@ -130,7 +130,7 @@ void _raw_read_lock(rwlock_t *rw) | |||
| 130 | while (!read_can_lock(rw)) { | 130 | while (!read_can_lock(rw)) { |
| 131 | if (--stuck == 0) { | 131 | if (--stuck == 0) { |
| 132 | printk("_read_lock(%p) CPU#%d lock %d\n", | 132 | printk("_read_lock(%p) CPU#%d lock %d\n", |
| 133 | rw, _smp_processor_id(), rw->lock); | 133 | rw, raw_smp_processor_id(), rw->lock); |
| 134 | stuck = INIT_STUCK; | 134 | stuck = INIT_STUCK; |
| 135 | } | 135 | } |
| 136 | } | 136 | } |
| @@ -158,7 +158,7 @@ void _raw_write_lock(rwlock_t *rw) | |||
| 158 | while (!write_can_lock(rw)) { | 158 | while (!write_can_lock(rw)) { |
| 159 | if (--stuck == 0) { | 159 | if (--stuck == 0) { |
| 160 | printk("write_lock(%p) CPU#%d lock %d)\n", | 160 | printk("write_lock(%p) CPU#%d lock %d)\n", |
| 161 | rw, _smp_processor_id(), rw->lock); | 161 | rw, raw_smp_processor_id(), rw->lock); |
| 162 | stuck = INIT_STUCK; | 162 | stuck = INIT_STUCK; |
| 163 | } | 163 | } |
| 164 | } | 164 | } |