Commit dcad7854 authored by Al Viro's avatar Al Viro
Browse files

csky: switch to ->regset_get() 



NB: WTF is fpregs_get() playing at???

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent a6ea5b45

arch/csky/kernel/ptrace.c

+10 −14
Original line number Original line Diff line number Diff line
@@ -76,17 +76,14 @@ enum csky_regset { 




static int gpr_get(struct task_struct *target,

static int gpr_get(struct task_struct *target,

		   const struct user_regset *regset,

		   const struct user_regset *regset,

		   unsigned int pos, unsigned int count,

		   struct membuf to)

		   void *kbuf, void __user *ubuf)

{

{

	struct pt_regs *regs;

	struct pt_regs *regs = task_pt_regs(target);



	regs = task_pt_regs(target);





	/* Abiv1 regs->tls is fake and we need sync here. */

	/* Abiv1 regs->tls is fake and we need sync here. */

	regs->tls = task_thread_info(target)->tp_value;

	regs->tls = task_thread_info(target)->tp_value;





	return user_regset_copyout(&pos, &count, &kbuf, &ubuf, regs, 0, -1);

	return membuf_write(&to, regs, sizeof(regs));

}

}





static int gpr_set(struct task_struct *target,

static int gpr_set(struct task_struct *target,
@@ -114,8 +111,7 @@ static int gpr_set(struct task_struct *target, 




static int fpr_get(struct task_struct *target,

static int fpr_get(struct task_struct *target,

		   const struct user_regset *regset,

		   const struct user_regset *regset,

		   unsigned int pos, unsigned int count,

		   struct membuf to)

		   void *kbuf, void __user *ubuf)

{

{

	struct user_fp *regs = (struct user_fp *)&target->thread.user_fp;

	struct user_fp *regs = (struct user_fp *)&target->thread.user_fp;
@@ -131,9 +127,9 @@ static int fpr_get(struct task_struct *target, 
	for (i = 0; i < 32; i++)

	for (i = 0; i < 32; i++)

		tmp.vr[64 + i] = regs->vr[32 + i];

		tmp.vr[64 + i] = regs->vr[32 + i];





	return user_regset_copyout(&pos, &count, &kbuf, &ubuf, &tmp, 0, -1);

	return membuf_write(&to, &tmp, sizeof(tmp));

#else

#else

	return user_regset_copyout(&pos, &count, &kbuf, &ubuf, regs, 0, -1);

	return membuf_write(&to, regs, sizeof(*regs));

#endif

#endif

}

}
@@ -173,16 +169,16 @@ static const struct user_regset csky_regsets[] = { 
		.n = sizeof(struct pt_regs) / sizeof(u32),

		.n = sizeof(struct pt_regs) / sizeof(u32),

		.size = sizeof(u32),

		.size = sizeof(u32),

		.align = sizeof(u32),

		.align = sizeof(u32),

		.get = &gpr_get,

		.regset_get = gpr_get,

		.set = &gpr_set,

		.set = gpr_set,

	},

	},

	[REGSET_FPR] = {

	[REGSET_FPR] = {

		.core_note_type = NT_PRFPREG,

		.core_note_type = NT_PRFPREG,

		.n = sizeof(struct user_fp) / sizeof(u32),

		.n = sizeof(struct user_fp) / sizeof(u32),

		.size = sizeof(u32),

		.size = sizeof(u32),

		.align = sizeof(u32),

		.align = sizeof(u32),

		.get = &fpr_get,

		.regset_get = fpr_get,

		.set = &fpr_set,

		.set = fpr_set,

	},

	},

};

};