Skip to content

Commit a6ea5b4

Browse files
author
Al Viro
committed
xtensa: switch to ->regset_get()
Signed-off-by: Al Viro <[email protected]>
1 parent bd0409a commit a6ea5b4

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

arch/xtensa/kernel/ptrace.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737

3838
static int gpr_get(struct task_struct *target,
3939
const struct user_regset *regset,
40-
unsigned int pos, unsigned int count,
41-
void *kbuf, void __user *ubuf)
40+
struct membuf to)
4241
{
4342
struct pt_regs *regs = task_pt_regs(target);
4443
struct user_pt_regs newregs = {
@@ -60,8 +59,7 @@ static int gpr_get(struct task_struct *target,
6059
regs->areg,
6160
(WSBITS - regs->windowbase) * 16);
6261

63-
return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
64-
&newregs, 0, -1);
62+
return membuf_write(&to, &newregs, sizeof(newregs));
6563
}
6664

6765
static int gpr_set(struct task_struct *target,
@@ -115,8 +113,7 @@ static int gpr_set(struct task_struct *target,
115113

116114
static int tie_get(struct task_struct *target,
117115
const struct user_regset *regset,
118-
unsigned int pos, unsigned int count,
119-
void *kbuf, void __user *ubuf)
116+
struct membuf to)
120117
{
121118
int ret;
122119
struct pt_regs *regs = task_pt_regs(target);
@@ -141,8 +138,7 @@ static int tie_get(struct task_struct *target,
141138
newregs->cp6 = ti->xtregs_cp.cp6;
142139
newregs->cp7 = ti->xtregs_cp.cp7;
143140
#endif
144-
ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
145-
newregs, 0, -1);
141+
ret = membuf_write(&to, newregs, sizeof(*newregs));
146142
kfree(newregs);
147143
return ret;
148144
}
@@ -197,15 +193,15 @@ static const struct user_regset xtensa_regsets[] = {
197193
.n = sizeof(struct user_pt_regs) / sizeof(u32),
198194
.size = sizeof(u32),
199195
.align = sizeof(u32),
200-
.get = gpr_get,
196+
.regset_get = gpr_get,
201197
.set = gpr_set,
202198
},
203199
[REGSET_TIE] = {
204200
.core_note_type = NT_PRFPREG,
205201
.n = sizeof(elf_xtregs_t) / sizeof(u32),
206202
.size = sizeof(u32),
207203
.align = sizeof(u32),
208-
.get = tie_get,
204+
.regset_get = tie_get,
209205
.set = tie_set,
210206
},
211207
};

0 commit comments

Comments
 (0)