diff options
| author |   Alexander van Heukelum <heukelum@fastmail.fm> | 2008-10-22 12:00:14 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-10-22 14:00:26 +0200 |
| commit | 871d3779cba18b028e34d0d2f6cc6caae76a97b6 (patch) | |
| tree | 858df7bc1f66d47bb6969af31f6c843eb7e361a5 /arch/x86/kernel/dumpstack_64.c | |
| parent | i386, dumpstack: use oops_begin/oops_end in die_nmi (diff) | |
| download | linux-dev-871d3779cba18b028e34d0d2f6cc6caae76a97b6.tar.xz linux-dev-871d3779cba18b028e34d0d2f6cc6caae76a97b6.zip | |
i386, dumpstack: unify die()
Make i386's die() equal to x86_64's version.
Whitespace-only changes on x86_64, to make it equal to i386's
version. (user_mode and user_mode_vm are equal on x86_64.)
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/dumpstack_64.c')
| -rw-r--r-- | arch/x86/kernel/dumpstack_64.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c index 831e1e159cb4..28c67aae5562 100644 --- a/arch/x86/kernel/dumpstack_64.c +++ b/arch/x86/kernel/dumpstack_64.c @@ -506,12 +506,16 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err) return 0; } +/* + * This is gone through when something in the kernel has done something bad + * and is about to be terminated: + */ void die(const char *str, struct pt_regs *regs, long err) { unsigned long flags = oops_begin(); int sig = SIGSEGV; - if (!user_mode(regs)) + if (!user_mode_vm(regs)) report_bug(regs->ip, regs); if (__die(str, regs, err)) |