The patch titled
um: PTRACE_[GS]ETFPXREGS had been wired on the wrong subarch
has been removed from the -mm tree. Its filename was
um-ptrace_etfpxregs-had-been-wired-on-the-wrong-subarch.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: um: PTRACE_[GS]ETFPXREGS had been wired on the wrong subarch
From: Al Viro <viro@xxxxxxxxxxxxxxxx>
It's 32bit-only, not 64bit-only... And while we are at it, it's
set_fpxregs(), not set_fpregs()...
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Richard Weinberger <richard@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/um/sys-i386/ptrace.c | 14 +++++++++++++-
arch/um/sys-x86_64/ptrace.c | 14 +-------------
2 files changed, 14 insertions(+), 14 deletions(-)
diff -puN arch/um/sys-i386/ptrace.c~um-ptrace_etfpxregs-had-been-wired-on-the-wrong-subarch arch/um/sys-i386/ptrace.c
--- a/arch/um/sys-i386/ptrace.c~um-ptrace_etfpxregs-had-been-wired-on-the-wrong-subarch
+++ a/arch/um/sys-i386/ptrace.c
@@ -206,5 +206,17 @@ int set_fpxregs(struct user_fxsr_struct
long subarch_ptrace(struct task_struct *child, long request,
unsigned long addr, unsigned long data)
{
- return -EIO;
+ int ret = -EIO;
+ void __user *datap = (void __user *) data;
+
+ switch (request) {
+ case PTRACE_GETFPXREGS: /* Get the child FPU state. */
+ ret = get_fpxregs(datap, child);
+ break;
+ case PTRACE_SETFPXREGS: /* Set the child FPU state. */
+ ret = set_fpxregs(datap, child);
+ break;
+ }
+
+ return ret;
}
diff -puN arch/um/sys-x86_64/ptrace.c~um-ptrace_etfpxregs-had-been-wired-on-the-wrong-subarch arch/um/sys-x86_64/ptrace.c
--- a/arch/um/sys-x86_64/ptrace.c~um-ptrace_etfpxregs-had-been-wired-on-the-wrong-subarch
+++ a/arch/um/sys-x86_64/ptrace.c
@@ -178,17 +178,5 @@ int set_fpregs(struct user_i387_struct _
long subarch_ptrace(struct task_struct *child, long request,
unsigned long addr, unsigned long data)
{
- int ret = -EIO;
- void __user *datap = (void __user *) data;
-
- switch (request) {
- case PTRACE_GETFPXREGS: /* Get the child FPU state. */
- ret = get_fpregs(datap, child);
- break;
- case PTRACE_SETFPXREGS: /* Set the child FPU state. */
- ret = set_fpregs(datap, child);
- break;
- }
-
- return ret;
+ return -EIO;
}
_
Patches currently in -mm which might be from viro@xxxxxxxxxxxxxxxx are
origin.patch
slab-leaks3-default-y.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
