summaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/traps.c
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2006-12-07 05:37:22 +0100
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 17:39:36 +0100
commit6cfd76a26d9fe2ba54b9d496a48c1d9285e5c5ed (patch)
tree1114a0630c5045d0650c6d78a8097fdea6f94d8e /arch/i386/kernel/traps.c
parent[PATCH] lockdep: print current locks on in_atomic warnings (diff)
downloadlinux-6cfd76a26d9fe2ba54b9d496a48c1d9285e5c5ed.tar.xz
linux-6cfd76a26d9fe2ba54b9d496a48c1d9285e5c5ed.zip
[PATCH] lockdep: name some old style locks
Name some of the remaning 'old_style_spin_init' locks Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/kernel/traps.c')
-rw-r--r--arch/i386/kernel/traps.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index fe9c5e8e7e6f..3124f1b04d67 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -452,7 +452,7 @@ void die(const char * str, struct pt_regs * regs, long err)
u32 lock_owner;
int lock_owner_depth;
} die = {
- .lock = SPIN_LOCK_UNLOCKED,
+ .lock = __SPIN_LOCK_UNLOCKED(die.lock),
.lock_owner = -1,
.lock_owner_depth = 0
};