diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-27 02:40:02 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-16 21:19:15 -0400 |
commit | c6fee0810df4e0f4cf9c4834d2569ca01c02cffc (patch) | |
tree | 7b6adabf750ca0279895f8b9aa8a42eb9837e4e2 /arch/sparc/kernel/traps_64.c | |
parent | 0399bb5b918bd8ffbf065a3db142ff121aaa18e0 (diff) |
sparc64: Fix build errors with gcc-4.6.0
Most of the warnings emitted (we fail arch/sparc file
builds with -Werror) were legitimate but harmless, however
one case (n2_pcr_write) was a genuine bug.
Based almost entirely upon a patch by Sam Ravnborg.
Reported-by: Dennis Gilmore <dennis@ausil.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/traps_64.c')
-rw-r--r-- | arch/sparc/kernel/traps_64.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c index 1e9770936c3b..1ed547bd850f 100644 --- a/arch/sparc/kernel/traps_64.c +++ b/arch/sparc/kernel/traps_64.c | |||
@@ -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 { |