diff options
author | Alexander van Heukelum <heukelum@fastmail.fm> | 2008-07-10 15:14:52 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 10:21:17 -0400 |
commit | 78cbac65fd77242f3e5d77f4d7a71e8bc869fe4d (patch) | |
tree | 8ada810cc1f2f1f26644f6517b7f131fdb130c5d /arch/x86/kernel/traps_64.c | |
parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) |
x86: traps_xx: refactor die() like in x86_64
Make the diff between the traps_32.c and traps_64.c a bit smaller.
Change traps_32.c to look more like traps_64.c:
- move lock information to file scope
- split out oops_begin() and oops_end() from die()
- increment nest counter in oops_begin
Only whitespace change in traps_64.c
No functional changes intended.
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Acked-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/traps_64.c')
-rw-r--r-- | arch/x86/kernel/traps_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c index 2696a6837782..babdbe673b7f 100644 --- a/arch/x86/kernel/traps_64.c +++ b/arch/x86/kernel/traps_64.c | |||
@@ -518,7 +518,7 @@ unsigned __kprobes long oops_begin(void) | |||
518 | } | 518 | } |
519 | 519 | ||
520 | void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr) | 520 | void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr) |
521 | { | 521 | { |
522 | die_owner = -1; | 522 | die_owner = -1; |
523 | bust_spinlocks(0); | 523 | bust_spinlocks(0); |
524 | die_nest_count--; | 524 | die_nest_count--; |