Emulation/switch-linux
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-linux.git synced 2025-05-04 02:34:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86: dumpstack: Clean up the x86_stack_ids[][] initalization and other details

Browse source 
Make the initialization more readable, plus tidy up a few small
visual details as well.

No change in functionality.

LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2009-11-26 08:17:31 +01:00
parent 27c13ecec4
commit b803090615
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/x86/kernel/dumpstack_32.c
View file

@ -10,9 +10,9 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <linux/kexec.h> #include <linux/kexec.h>
#include <linux/sysfs.h>
#include <linux/bug.h> #include <linux/bug.h>
#include <linux/nmi.h> #include <linux/nmi.h>
#include <linux/sysfs.h>
#include <asm/stacktrace.h> #include <asm/stacktrace.h>
@ -35,6 +35,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
if (!stack) { if (!stack) {
unsigned long dummy; unsigned long dummy;
stack = &dummy; stack = &dummy;
if (task && task != current) if (task && task != current)
stack = (unsigned long *)task->thread.sp; stack = (unsigned long *)task->thread.sp;
@ -57,8 +58,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
context = (struct thread_info *) context = (struct thread_info *)
((unsigned long)stack & (~(THREAD_SIZE - 1))); ((unsigned long)stack & (~(THREAD_SIZE - 1)));
bp = print_context_stack(context, stack, bp, ops, bp = print_context_stack(context, stack, bp, ops, data, NULL, &graph);
data, NULL, &graph);
stack = (unsigned long *)context->previous_esp; stack = (unsigned long *)context->previous_esp;
if (!stack) if (!stack)
@ -72,7 +72,7 @@ EXPORT_SYMBOL(dump_trace);
void void
show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
unsigned long *sp, unsigned long bp, char *log_lvl) unsigned long *sp, unsigned long bp, char *log_lvl)
{ {
unsigned long *stack; unsigned long *stack;
int i; int i;
@ -156,4 +156,3 @@ int is_valid_bugaddr(unsigned long ip)
return ud2 == 0x0b0f; return ud2 == 0x0b0f;
} }

25
arch/x86/kernel/dumpstack_64.c
View file

@ -10,26 +10,28 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <linux/kexec.h> #include <linux/kexec.h>
#include <linux/sysfs.h>
#include <linux/bug.h> #include <linux/bug.h>
#include <linux/nmi.h> #include <linux/nmi.h>
#include <linux/sysfs.h>
#include <asm/stacktrace.h> #include <asm/stacktrace.h>
#include "dumpstack.h" #include "dumpstack.h"
#define N_EXCEPTION_STACKS_END \
(N_EXCEPTION_STACKS + DEBUG_STKSZ/EXCEPTION_STKSZ - 2)
static char x86_stack_ids[][8] = { static char x86_stack_ids[][8] = {
[DEBUG_STACK - 1] = "#DB", [ DEBUG_STACK-1 ] = "#DB",
[NMI_STACK - 1] = "NMI", [ NMI_STACK-1 ] = "NMI",
[DOUBLEFAULT_STACK - 1] = "#DF", [ DOUBLEFAULT_STACK-1 ] = "#DF",
[STACKFAULT_STACK - 1] = "#SS", [ STACKFAULT_STACK-1 ] = "#SS",
[MCE_STACK - 1] = "#MC", [ MCE_STACK-1 ] = "#MC",
#if DEBUG_STKSZ > EXCEPTION_STKSZ #if DEBUG_STKSZ > EXCEPTION_STKSZ
[N_EXCEPTION_STACKS ... [ N_EXCEPTION_STACKS ...
N_EXCEPTION_STACKS + DEBUG_STKSZ / EXCEPTION_STKSZ - 2] = "#DB[?]" N_EXCEPTION_STACKS_END ] = "#DB[?]"
#endif #endif
}; };
int x86_is_stack_id(int id, char *name) int x86_is_stack_id(int id, char *name)
{ {
@ -37,7 +39,7 @@ int x86_is_stack_id(int id, char *name)
} }
static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack, static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack,
unsigned *usedp, char **idp) unsigned *usedp, char **idp)
{ {
unsigned k; unsigned k;
@ -202,7 +204,7 @@ EXPORT_SYMBOL(dump_trace);
void void
show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
unsigned long *sp, unsigned long bp, char *log_lvl) unsigned long *sp, unsigned long bp, char *log_lvl)
{ {
unsigned long *stack; unsigned long *stack;
int i; int i;
@ -303,4 +305,3 @@ int is_valid_bugaddr(unsigned long ip)
return ud2 == 0x0b0f; return ud2 == 0x0b0f;
} }