The patch titled
uml: __user annotations
has been removed from the -mm tree. Its filename is
uml-__user-annotations.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
bits of uml __user annotations lost in merge
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/sys-i386/signal.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff -puN arch/um/sys-i386/signal.c~uml-__user-annotations arch/um/sys-i386/signal.c
--- devel/arch/um/sys-i386/signal.c~uml-__user-annotations 2006-04-18 22:20:00.000000000 -0700
+++ devel-akpm/arch/um/sys-i386/signal.c 2006-04-18 22:20:00.000000000 -0700
@@ -57,7 +57,7 @@ static int copy_sc_from_user_skas(struct
return(0);
}
-int copy_sc_to_user_skas(struct sigcontext *to, struct _fpstate __user *to_fp,
+int copy_sc_to_user_skas(struct sigcontext __user *to, struct _fpstate __user *to_fp,
struct pt_regs *regs, unsigned long sp)
{
struct sigcontext sc;
@@ -132,7 +132,7 @@ int copy_sc_from_user_tt(struct sigconte
return(err);
}
-int copy_sc_to_user_tt(struct sigcontext *to, struct _fpstate __user *fp,
+int copy_sc_to_user_tt(struct sigcontext __user *to, struct _fpstate __user *fp,
struct sigcontext *from, int fpsize, unsigned long sp)
{
struct _fpstate __user *to_fp;
@@ -167,7 +167,7 @@ static int copy_sc_from_user(struct pt_r
return(ret);
}
-static int copy_sc_to_user(struct sigcontext *to, struct _fpstate __user *fp,
+static int copy_sc_to_user(struct sigcontext __user *to, struct _fpstate __user *fp,
struct pt_regs *from, unsigned long sp)
{
return(CHOOSE_MODE(copy_sc_to_user_tt(to, fp, UPT_SC(&from->regs),
_
Patches currently in -mm which might be from viro@xxxxxxxxxxxxxxxxxx are
origin.patch
audit-deal-with-deadlocks-in-audit_free.patch
audit-sockaddr-patch.patch
audit-move-call-of-audit_free-into-do_exit.patch
audit-drop-gfp_mask-in-audit_log_exit.patch
audit-drop-task-argument-of-audit_syscall_entryexit.patch
audit-no-need-to-wank-with-task_lock-and-pinning-task-down-in-audit_syscall_exit.patch
audit-support-for-context-based-audit-filtering.patch
audit-support-for-context-based-audit-filtering-2.patch
audit-audit-inode-patch.patch
audit-change-lspp-ipc-auditing.patch
audit-reworked-patch-for-labels-on-user-space-messages.patch
audit-more-user-space-subject-labels.patch
audit-rework-of-ipc-auditing.patch
audit-audit-filter-performance.patch
vfs-add-lock-owner-argument-to-flush-operation.patch
git-viro-bird-m32r.patch
git-viro-bird-m68k.patch
git-viro-bird-frv.patch
git-viro-bird-upf.patch
git-viro-bird-volatile.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
