[kernel] r17431 - in dists/squeeze/linux-2.6/debian: . patches/features/arm patches/series

[Ben Hutchings]

Author: benh
Date: Tue May 17 03:38:53 2011
New Revision: 17431

Log:
[armel] Implement accept4() system call (Closes: #625752)

Added:
   dists/squeeze/linux-2.6/debian/patches/features/arm/ARM-wire-up-sys_accept4-on-ARM.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/35

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Tue May 17 03:32:18 2011	(r17430)
+++ dists/squeeze/linux-2.6/debian/changelog	Tue May 17 03:38:53 2011	(r17431)
@@ -27,6 +27,7 @@
   * [x86] cpu: Set ARAT feature on some AMD processors (deferred from
     2.6.32.39 due to apparent regression which was fixed in 2.6.32.40)
   * [hppa] Bump ABI to 5a
+  * [armel] Implement accept4() system call (Closes: #625752)
 
   [ Ian Campbell ]
   * Remove lazy vunmap for non-Xen flavours too. (Closes: #613634)

Added: dists/squeeze/linux-2.6/debian/patches/features/arm/ARM-wire-up-sys_accept4-on-ARM.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/features/arm/ARM-wire-up-sys_accept4-on-ARM.patch	Tue May 17 03:38:53 2011	(r17431)
@@ -0,0 +1,54 @@
+From: Mikael Pettersson <mikpe at it.uu.se>
+Date: Sun, 15 Aug 2010 10:47:23 +0100
+Subject: [PATCH] ARM: 6329/1: wire up sys_accept4() on ARM
+
+commit 21d93e2e29722d7832f61cc56d73fb953ee6578e upstream.
+
+sys_accept4() was added in kernel 2.6.28, but ARM was not updated
+to include it.  The number and types of parameters is such that
+no ARM-specific processing is needed, so wiring up sys_accept4()
+just requires defining __NR_accept4 and adding a direct call in
+the syscall entry table.
+
+Tested with an EABI 2.6.35 kernel and Ulrich Drepper's original
+accept4() test program, modified to define __NR_accept4 for ARM.
+
+Using the updated unistd.h also eliminates a warning then building
+glibc (2.10.2 and newer) about accept4() being unimplemented.
+
+Signed-off-by: Mikael Pettersson <mikpe at it.uu.se>
+Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
+[bwh: Add dummy entry for preceding syscall (365, recvmmsg).]
+---
+ arch/arm/include/asm/unistd.h |    1 +
+ arch/arm/kernel/calls.S       |    2 ++
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
+index 4e506d0..eb903ae 100644
+--- a/arch/arm/include/asm/unistd.h
++++ b/arch/arm/include/asm/unistd.h
+@@ -391,6 +391,7 @@
+ #define __NR_pwritev			(__NR_SYSCALL_BASE+362)
+ #define __NR_rt_tgsigqueueinfo		(__NR_SYSCALL_BASE+363)
+ #define __NR_perf_event_open		(__NR_SYSCALL_BASE+364)
++#define __NR_accept4			(__NR_SYSCALL_BASE+366)
+ 
+ /*
+  * The following SWIs are ARM private.
+diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
+index 4f07168..e088400 100644
+--- a/arch/arm/kernel/calls.S
++++ b/arch/arm/kernel/calls.S
+@@ -374,6 +374,8 @@
+ 		CALL(sys_pwritev)
+ 		CALL(sys_rt_tgsigqueueinfo)
+ 		CALL(sys_perf_event_open)
++/* 365 */	CALL(sys_ni_syscall)		/* recvmmsg */
++		CALL(sys_accept4)
+ #ifndef syscalls_counted
+ .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
+ #define syscalls_counted
+-- 
+1.7.5.1
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/35
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/35	Tue May 17 03:32:18 2011	(r17430)
+++ dists/squeeze/linux-2.6/debian/patches/series/35	Tue May 17 03:38:53 2011	(r17431)
@@ -251,3 +251,5 @@
 + features/x86/backlight-mbp_nvidia_bl-add-support-for-MacBookPro7-1.patch
 + debian/af_unix-Avoid-ABI-change-from-introduction-of-recursion-limit.patch
 + debian/slub-Reenable-for-m68k.patch
+
++ features/arm/ARM-wire-up-sys_accept4-on-ARM.patch