diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /arch/ppc/lib | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'arch/ppc/lib')
| -rw-r--r-- | arch/ppc/lib/locks.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/ppc/lib/locks.c b/arch/ppc/lib/locks.c index 699c13fad..d6b56dc5f 100644 --- a/arch/ppc/lib/locks.c +++ b/arch/ppc/lib/locks.c @@ -1,5 +1,5 @@ /* - * $Id: locks.c,v 1.23 1999/02/12 07:06:32 cort Exp $ + * $Id: locks.c,v 1.24 1999/08/03 19:16:47 cort Exp $ * * Locks for smp ppc * @@ -10,9 +10,9 @@ #include <linux/kernel.h> #include <linux/sched.h> #include <linux/delay.h> +#include <linux/spinlock.h> #include <asm/processor.h> #include <asm/system.h> -#include <asm/spinlock.h> #include <asm/io.h> #define DEBUG_LOCKS 1 @@ -113,7 +113,7 @@ void _read_unlock(rwlock_t *rw) #ifdef DEBUG_LOCKS if ( rw->lock == 0 ) printk("_read_unlock(): %s/%d (nip %08lX) lock %lx\n", - current->comm,current->pid,current->tss.regs->nip, + current->comm,current->pid,current->thread.regs->nip, rw->lock); #endif /* DEBUG_LOCKS */ wmb(); @@ -173,7 +173,7 @@ void _write_unlock(rwlock_t *rw) #ifdef DEBUG_LOCKS if ( !(rw->lock & (1<<31)) ) printk("_write_lock(): %s/%d (nip %08lX) lock %lx\n", - current->comm,current->pid,current->tss.regs->nip, + current->comm,current->pid,current->thread.regs->nip, rw->lock); #endif /* DEBUG_LOCKS */ wmb(); @@ -189,7 +189,7 @@ void __lock_kernel(struct task_struct *task) if ( (signed long)(task->lock_depth) < 0 ) { printk("__lock_kernel(): %s/%d (nip %08lX) lock depth %x\n", - task->comm,task->pid,task->tss.regs->nip, + task->comm,task->pid,task->thread.regs->nip, task->lock_depth); } #endif /* DEBUG_LOCKS */ @@ -219,7 +219,7 @@ void __unlock_kernel(struct task_struct *task) { printk("__unlock_kernel(): %s/%d (nip %08lX) " "lock depth %x flags %lx\n", - task->comm,task->pid,task->tss.regs->nip, + task->comm,task->pid,task->thread.regs->nip, task->lock_depth, klock_info.kernel_flag); klock_info.akp = NO_PROC_ID; klock_info.kernel_flag = 0; |