git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
[pandora-kernel.git]
/
arch
/
i386
/
kernel
/
traps.c
diff --git
a/arch/i386/kernel/traps.c
b/arch/i386/kernel/traps.c
index
c447807
..
68de48e
100644
(file)
--- a/
arch/i386/kernel/traps.c
+++ b/
arch/i386/kernel/traps.c
@@
-464,7
+464,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
};