Skip to content

Commit

Permalink
[PATCH] m68knommu: cleanup showstack()
Browse files Browse the repository at this point in the history
Make show_stack() consistent with other architectures.
Put the vector string names in the .rodata section.
Patch originally submitted by Philippe De Muyter <phdm@macqel.be>.

Signed-off-by: Greg Ungerer <gerg@uclinux.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Greg Ungerer authored and Linus Torvalds committed Sep 2, 2005
1 parent 5d052c1 commit db81fb8
Showing 1 changed file with 13 additions and 7 deletions.
20 changes: 13 additions & 7 deletions arch/m68knommu/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <linux/signal.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/a.out.h>
#include <linux/user.h>
Expand All @@ -38,7 +39,7 @@
#include <asm/machdep.h>
#include <asm/siginfo.h>

static char *vec_names[] = {
static char const * const vec_names[] = {
"RESET SP", "RESET PC", "BUS ERROR", "ADDRESS ERROR",
"ILLEGAL INSTRUCTION", "ZERO DIVIDE", "CHK", "TRAPcc",
"PRIVILEGE VIOLATION", "TRACE", "LINE 1010", "LINE 1111",
Expand Down Expand Up @@ -106,17 +107,20 @@ asmlinkage void buserr_c(struct frame *fp)

int kstack_depth_to_print = 48;

void show_stack(struct task_struct *task, unsigned long *esp)
void show_stack(struct task_struct *task, unsigned long *stack)
{
unsigned long *stack, *endstack, addr;
unsigned long *endstack, addr;
extern char _start, _etext;
int i;

if (esp == NULL)
esp = (unsigned long *) &esp;
if (!stack) {
if (task)
stack = (unsigned long *)task->thread.ksp;
else
stack = (unsigned long *)&stack;
}

stack = esp;
addr = (unsigned long) esp;
addr = (unsigned long) stack;
endstack = (unsigned long *) PAGE_ALIGN(addr);

printk(KERN_EMERG "Stack from %08lx:", (unsigned long)stack);
Expand Down Expand Up @@ -306,6 +310,8 @@ void dump_stack(void)
show_stack(current, &stack);
}

EXPORT_SYMBOL(dump_stack);

#ifdef CONFIG_M68KFPU_EMU
asmlinkage void fpemu_signal(int signal, int code, void *addr)
{
Expand Down

0 comments on commit db81fb8

Please sign in to comment.