linux-imx (2.6.35.3): use accept4 patch that was included mainline

This patch has been included in 2.6.36.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/001_Add_accept4_syscall.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/001_Add_accept4_syscall.patch
deleted file mode 100644 (file)
index 6480145..0000000
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/001_Add_accept4_syscall.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 4ac884455c992c7250eae2cdbd6ad1fbbe5d1dc0
-Author: Phil Endecott <git@chezphil.org>
-Date:   Mon Oct 31 20:23:38 2011 +0000
-
-    Add accept4 syscall
-
-diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
-index dd2bf53..d02cfb6 100644
---- a/arch/arm/include/asm/unistd.h
-+++ b/arch/arm/include/asm/unistd.h
-@@ -392,6 +392,7 @@
- #define __NR_rt_tgsigqueueinfo                (__NR_SYSCALL_BASE+363)
- #define __NR_perf_event_open          (__NR_SYSCALL_BASE+364)
- #define __NR_recvmmsg                 (__NR_SYSCALL_BASE+365)
-+#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 37ae301..afeb71f 100644
---- a/arch/arm/kernel/calls.S
-+++ b/arch/arm/kernel/calls.S
-@@ -375,6 +375,7 @@
-               CALL(sys_rt_tgsigqueueinfo)
-               CALL(sys_perf_event_open)
- /* 365 */     CALL(sys_recvmmsg)
-+              CALL(sys_accept4)
- #ifndef syscalls_counted
- .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
- #define syscalls_counted

diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/wire-up-sys_accept4-on-ARM.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/wire-up-sys_accept4-on-ARM.patch
new file mode 100644 (file)
index 0000000..7182e80
--- /dev/null
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/wire-up-sys_accept4-on-ARM.patch
@@ -0,0 +1,53 @@
+From 1415ec63689ef39bcb24b5095941ec4cc884035c Mon Sep 17 00:00:00 2001
+From: Mikael Pettersson <mikpe@it.uu.se>
+Date: Sun, 15 Aug 2010 10:47:23 +0100
+Subject: [PATCH 1/2] ARM: 6329/1: wire up sys_accept4() on ARM
+
+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.
+
+Upstream-Status: Backport [2.6.36]
+
+Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+---
+ arch/arm/include/asm/unistd.h |    1 +
+ arch/arm/kernel/calls.S       |    1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
+index dd2bf53..d02cfb6 100644
+--- a/arch/arm/include/asm/unistd.h
++++ b/arch/arm/include/asm/unistd.h
+@@ -392,6 +392,7 @@
+ #define __NR_rt_tgsigqueueinfo                (__NR_SYSCALL_BASE+363)
+ #define __NR_perf_event_open          (__NR_SYSCALL_BASE+364)
+ #define __NR_recvmmsg                 (__NR_SYSCALL_BASE+365)
++#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 37ae301..afeb71f 100644
+--- a/arch/arm/kernel/calls.S
++++ b/arch/arm/kernel/calls.S
+@@ -375,6 +375,7 @@
+               CALL(sys_rt_tgsigqueueinfo)
+               CALL(sys_perf_event_open)
+ /* 365 */     CALL(sys_recvmmsg)
++              CALL(sys_accept4)
+ #ifndef syscalls_counted
+ .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
+ #define syscalls_counted
+-- 
+1.6.6.1
+

diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb
index aed6d961e4e72b9bfc1e475587f190a0f7e341c1..f116b51de5b41833492f72e51ae4001be1cdcbcf 100644 (file)
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb
@@ -4,7 +4,7 @@
 DESCRIPTION = "Linux kernel for imx platforms"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-PR = "r21"
+PR = "r22"
 
 inherit kernel
 COMPATIBLE_MACHINE = "(mxs|mx5)"
@@ -33,8 +33,8 @@ SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git;tag=rel_imx_2.6.35_11.0
            file://w1-fix-support-multiple-master.patch \
            file://smsc95xx-randomize-mac-once.patch \
            file://dm9601-support-for-usb-ethernet-0x0fe6-0x9700.patch \
+           file://wire-up-sys_accept4-on-ARM.patch \
            file://0001-mx53_loco-add-USR-led-support.patch \
-           file://001_Add_accept4_syscall.patch \
            file://002_Return_ERESTARTSYS_from_IPU_GET_EVENT.patch \
            file://003_Sanitise_ipu_interrupt_return_value.patch \
            file://defconfig \