x86: dumpstack: Clean up the x86_stack_ids[][] initalization and other details
Commit-ID: b803090615ccec669681ff85ce28671e7bfefa3d Gitweb: http://git.kernel.org/tip/b803090615ccec669681ff85ce28671e7bfefa3d Author: Ingo Molnar <[email protected]> AuthorDate: Thu, 26 Nov 2009 08:17:31 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 26 Nov 2009 08:24:33 +0100
x86: dumpstack: Clean up the x86_stack_ids[][] initalization and other details
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 <[email protected]>
--- arch/x86/kernel/dumpstack_32.c | 9 ++++----- arch/x86/kernel/dumpstack_64.c | 25 +++++++++++++------------ 2 files changed, 17 insertions(+), 17 deletions(-)
arch/x86/kernel/dumpstack_32.c +4 -5
@@ -10,9 +10,9 @@#include <linux/module.h> #include <linux/ptrace.h> #include <linux/kexec.h> +#include <linux/sysfs.h> #include <linux/bug.h> #include <linux/nmi.h> -#include <linux/sysfs.h> #include <asm/stacktrace.h>
@@ -35,6 +35,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,if (!stack) {unsigned long dummy; + stack = &dummy;if (task && task != current) 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 *) ((unsigned long )stack & (~(THREAD_SIZE -1 ))); - bp =print_context_stack (context, stack, bp, ops, - data,NULL , &graph); + bp =print_context_stack (context, stack, bp, ops, data,NULL , &graph); stack = (unsigned long *)context->previous_esp;if (!stack)
@@ -72,7 +72,7 @@ EXPORT_SYMBOL(dump_trace);void 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;int i;
@@ -156,4 +156,3 @@ int is_valid_bugaddr(unsigned long ip)return ud2 ==0x0b0f ; } -
arch/x86/kernel/dumpstack_64.c +13 -12
@@ -10,26 +10,28 @@#include <linux/module.h> #include <linux/ptrace.h> #include <linux/kexec.h> +#include <linux/sysfs.h> #include <linux/bug.h> #include <linux/nmi.h> -#include <linux/sysfs.h> #include <asm/stacktrace.h> #include "dumpstack.h" +#define N_EXCEPTION_STACKS_END \ + (N_EXCEPTION_STACKS + DEBUG_STKSZ/EXCEPTION_STKSZ - 2)static char x86_stack_ids[][8 ] = { - [DEBUG_STACK -1 ] ="#DB" , - [NMI_STACK -1 ] ="NMI" , - [DOUBLEFAULT_STACK -1 ] ="#DF" , - [STACKFAULT_STACK -1 ] ="#SS" , - [MCE_STACK -1 ] ="#MC" , + [DEBUG_STACK -1 ] ="#DB" , + [NMI_STACK -1 ] ="NMI" , + [DOUBLEFAULT_STACK -1 ] ="#DF" , + [STACKFAULT_STACK -1 ] ="#SS" , + [MCE_STACK -1 ] ="#MC" , #if DEBUG_STKSZ > EXCEPTION_STKSZ - [N_EXCEPTION_STACKS ... -N_EXCEPTION_STACKS +DEBUG_STKSZ /EXCEPTION_STKSZ -2 ] ="#DB[?]" + [ N_EXCEPTION_STACKS ... +N_EXCEPTION_STACKS_END ] ="#DB[?]" #endif - }; +};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, -unsigned *usedp,char **idp) +unsigned *usedp,char **idp) {unsigned k;
@@ -202,7 +204,7 @@ EXPORT_SYMBOL(dump_trace);void 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;int i;
@@ -303,4 +305,3 @@ int is_valid_bugaddr(unsigned long ip)return ud2 ==0x0b0f ; } -