Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 15270
b: refs/heads/master
c: bb44f11
h: refs/heads/master
v: v3
  • Loading branch information
Ingo Molnar authored and Linus Torvalds committed Dec 20, 2005
1 parent 96ea305 commit 79c976c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 391eadeec836463a4e6e3843953bbe40f6522593
refs/heads/master: bb44f116a14c4c932f15c79acfafd46bcb43ca9a
18 changes: 10 additions & 8 deletions trunk/lib/spinlock_debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ static void spin_bug(spinlock_t *lock, const char *msg)
if (lock->owner && lock->owner != SPINLOCK_OWNER_INIT)
owner = lock->owner;
printk("BUG: spinlock %s on CPU#%d, %s/%d\n",
msg, smp_processor_id(), current->comm, current->pid);
msg, raw_smp_processor_id(),
current->comm, current->pid);
printk(" lock: %p, .magic: %08x, .owner: %s/%d, .owner_cpu: %d\n",
lock, lock->magic,
owner ? owner->comm : "<none>",
Expand Down Expand Up @@ -78,8 +79,8 @@ static void __spin_lock_debug(spinlock_t *lock)
if (print_once) {
print_once = 0;
printk("BUG: spinlock lockup on CPU#%d, %s/%d, %p\n",
smp_processor_id(), current->comm, current->pid,
lock);
raw_smp_processor_id(), current->comm,
current->pid, lock);
dump_stack();
}
}
Expand Down Expand Up @@ -120,7 +121,8 @@ static void rwlock_bug(rwlock_t *lock, const char *msg)

if (xchg(&print_once, 0)) {
printk("BUG: rwlock %s on CPU#%d, %s/%d, %p\n", msg,
smp_processor_id(), current->comm, current->pid, lock);
raw_smp_processor_id(), current->comm,
current->pid, lock);
dump_stack();
#ifdef CONFIG_SMP
/*
Expand Down Expand Up @@ -148,8 +150,8 @@ static void __read_lock_debug(rwlock_t *lock)
if (print_once) {
print_once = 0;
printk("BUG: read-lock lockup on CPU#%d, %s/%d, %p\n",
smp_processor_id(), current->comm, current->pid,
lock);
raw_smp_processor_id(), current->comm,
current->pid, lock);
dump_stack();
}
}
Expand Down Expand Up @@ -220,8 +222,8 @@ static void __write_lock_debug(rwlock_t *lock)
if (print_once) {
print_once = 0;
printk("BUG: write-lock lockup on CPU#%d, %s/%d, %p\n",
smp_processor_id(), current->comm, current->pid,
lock);
raw_smp_processor_id(), current->comm,
current->pid, lock);
dump_stack();
}
}
Expand Down

0 comments on commit 79c976c

Please sign in to comment.