The patch titled
x86_64: Add compat_sys_vmsplice and use it in x86-64
has been added to the -mm tree. Its filename is
x86_64-add-compat_sys_vmsplice-and-use-it-in.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: "Andi Kleen" <ak@xxxxxxx>
Signed-off-by: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/x86_64/ia32/ia32entry.S | 1 +
fs/compat.c | 20 ++++++++++++++++++++
2 files changed, 21 insertions(+)
diff -puN arch/x86_64/ia32/ia32entry.S~x86_64-add-compat_sys_vmsplice-and-use-it-in arch/x86_64/ia32/ia32entry.S
--- 25/arch/x86_64/ia32/ia32entry.S~x86_64-add-compat_sys_vmsplice-and-use-it-in Fri Apr 28 16:43:19 2006
+++ 25-akpm/arch/x86_64/ia32/ia32entry.S Fri Apr 28 16:43:19 2006
@@ -695,4 +695,5 @@ ia32_sys_call_table:
.quad sys_splice
.quad sys_sync_file_range
.quad sys_tee
+ .quad compat_sys_vmsplice
ia32_syscall_end:
diff -puN fs/compat.c~x86_64-add-compat_sys_vmsplice-and-use-it-in fs/compat.c
--- 25/fs/compat.c~x86_64-add-compat_sys_vmsplice-and-use-it-in Fri Apr 28 16:43:19 2006
+++ 25-akpm/fs/compat.c Fri Apr 28 16:43:19 2006
@@ -1317,6 +1317,26 @@ out:
return ret;
}
+asmlinkage long
+compat_sys_vmsplice(int fd, const struct compat_iovec __user *iov32,
+ unsigned int nr_segs, unsigned int flags)
+{
+ unsigned i;
+ struct iovec *iov;
+ if (nr_segs >= UIO_MAXIOV)
+ return -EINVAL;
+ iov = compat_alloc_user_space(nr_segs * sizeof(struct iovec));
+ for (i = 0; i < nr_segs; i++) {
+ struct compat_iovec v;
+ if (get_user(v.iov_base, &iov32[i].iov_base) ||
+ get_user(v.iov_len, &iov32[i].iov_len) ||
+ put_user(compat_ptr(v.iov_base), &iov[i].iov_base) ||
+ put_user(v.iov_len, &iov[i].iov_len))
+ return -EFAULT;
+ }
+ return sys_vmsplice(fd, iov, nr_segs, flags);
+}
+
/*
* Exactly like fs/open.c:sys_open(), except that it doesn't set the
* O_LARGEFILE flag.
_
Patches currently in -mm which might be from ak@xxxxxxx are
origin.patch
x86_64-add-compat_sys_vmsplice-and-use-it-in.patch
i386-x86-64-fix-acpi-disabled-lapic-handling.patch
i386-fix-overflow-in-e820_all_mapped.patch
i386-remove-apic=-warning.patch
git-acpi.patch
git-agpgart.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
