csky: fixup wrong pt_regs size
Subsystems (3)
[email protected]
maintainerPATCH 1/2 csky: fixup wrong pt_regs size
From: Guo Ren <[email protected]>
The bug is from commit 2054f4af1957 ("csky: bugfix gdb coredump error.")
We change the ELF_NGREG to ELF_NGREG - 2 to fit gdb define, but forgot modify ptrace regset. Now coredump use ELF_NRGEG to fit gdb and gcc-csky.c define and ptrace use pt_regs as regset, there are two different output regs styles.
Signed-off-by Guo Ren <[email protected]>
--- arch/csky/kernel/ptrace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/csky/kernel/ptrace.c +2 -1
@@ -8,6 +8,7 @@#include <linux/ptrace.h> #include <linux/regset.h> #include <linux/sched.h> +#include <linux/sched/task_stack.h> #include <linux/signal.h> #include <linux/smp.h> #include <linux/uaccess.h>
@@ -159,7 +160,7 @@ static int fpr_set(struct task_struct *target,static const struct user_regset csky_regsets[] = { [REGSET_GPR ] = { .core_note_type =NT_PRSTATUS , - .n =ELF_NGREG , + .n =sizeof (struct pt_regs ) /sizeof (u32), .size =sizeof (u32), .align =sizeof (u32), .get = &gpr_get,
Signature · 1 line
2.7.4
[email protected]
maintainerPATCH 2/2 csky: coding convention: use task_stack_page
From: Guo Ren <[email protected]>
Use task_stack_page instead of p->stack to get stack. Follow the coding convention style. Also for init_stack, the same with other archs.
Signed-off-by Guo Ren <[email protected]>
--- arch/csky/include/asm/processor.h | 4 ++-- arch/csky/kernel/smp.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-)
arch/csky/include/asm/processor.h +2 -2
@@ -49,7 +49,7 @@ struct thread_struct { };#define INIT_THREAD { \ - .ksp = (unsigned long) init_thread_union.stack + THREAD_SIZE, \ + .ksp = sizeof(init_stack) + (unsigned long) &init_stack, \ .sr = DEFAULT_PSR_VALUE, \ }
@@ -95,7 +95,7 @@ unsigned long get_wchan(struct task_struct *p);#define KSTK_ESP (tsk) (task_pt_regs(tsk)->usp)#define task_pt_regs (p) \ - ((struct pt_regs *)(THREAD_SIZE + p->stack) - 1) + ((struct pt_regs *)(THREAD_SIZE + task_stack_page(p)) - 1)#define cpu_relax () barrier()
arch/csky/kernel/smp.c +2 -1
@@ -160,7 +160,8 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle) {unsigned long mask =1 << cpu; - secondary_stack = (unsigned int )tidle->stack +THREAD_SIZE -8 ; + secondary_stack = + (unsigned int )task_stack_page (tidle) +THREAD_SIZE -8 ; secondary_hint =mfcr ("cr31" ); secondary_ccr =mfcr ("cr18" );
Signature · 1 line
2.7.4