diff options
Diffstat (limited to 'arch/sparc/kernel/traps_64.c')
-rw-r--r-- | arch/sparc/kernel/traps_64.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c index 42ad2ba85010..0cbdaa41cd1e 100644 --- a/arch/sparc/kernel/traps_64.c +++ b/arch/sparc/kernel/traps_64.c | |||
@@ -622,7 +622,7 @@ static const char CHAFSR_PERR_msg[] = | |||
622 | static const char CHAFSR_IERR_msg[] = | 622 | static const char CHAFSR_IERR_msg[] = |
623 | "Internal processor error"; | 623 | "Internal processor error"; |
624 | static const char CHAFSR_ISAP_msg[] = | 624 | static const char CHAFSR_ISAP_msg[] = |
625 | "System request parity error on incoming addresss"; | 625 | "System request parity error on incoming address"; |
626 | static const char CHAFSR_UCU_msg[] = | 626 | static const char CHAFSR_UCU_msg[] = |
627 | "Uncorrectable E-cache ECC error for ifetch/data"; | 627 | "Uncorrectable E-cache ECC error for ifetch/data"; |
628 | static const char CHAFSR_UCC_msg[] = | 628 | static const char CHAFSR_UCC_msg[] = |
@@ -1804,7 +1804,7 @@ static const char *sun4v_err_type_to_str(u32 type) | |||
1804 | return "warning resumable"; | 1804 | return "warning resumable"; |
1805 | default: | 1805 | default: |
1806 | return "unknown"; | 1806 | return "unknown"; |
1807 | }; | 1807 | } |
1808 | } | 1808 | } |
1809 | 1809 | ||
1810 | static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent, int cpu, const char *pfx, atomic_t *ocnt) | 1810 | static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent, int cpu, const char *pfx, atomic_t *ocnt) |
@@ -2152,7 +2152,7 @@ static void user_instruction_dump(unsigned int __user *pc) | |||
2152 | 2152 | ||
2153 | void show_stack(struct task_struct *tsk, unsigned long *_ksp) | 2153 | void show_stack(struct task_struct *tsk, unsigned long *_ksp) |
2154 | { | 2154 | { |
2155 | unsigned long fp, thread_base, ksp; | 2155 | unsigned long fp, ksp; |
2156 | struct thread_info *tp; | 2156 | struct thread_info *tp; |
2157 | int count = 0; | 2157 | int count = 0; |
2158 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | 2158 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER |
@@ -2173,7 +2173,6 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp) | |||
2173 | flushw_all(); | 2173 | flushw_all(); |
2174 | 2174 | ||
2175 | fp = ksp + STACK_BIAS; | 2175 | fp = ksp + STACK_BIAS; |
2176 | thread_base = (unsigned long) tp; | ||
2177 | 2176 | ||
2178 | printk("Call Trace:\n"); | 2177 | printk("Call Trace:\n"); |
2179 | do { | 2178 | do { |