From: Greg Kroah-Hartman Date: Sat, 19 May 2012 00:59:17 +0000 (-0700) Subject: 3.0-stable patches X-Git-Tag: v3.0.32~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e141843d9e205c9b0cf2712b896f45df905aeef;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: ia64-add-accept4-syscall.patch --- diff --git a/queue-3.0/ia64-add-accept4-syscall.patch b/queue-3.0/ia64-add-accept4-syscall.patch new file mode 100644 index 00000000000..5d736a61423 --- /dev/null +++ b/queue-3.0/ia64-add-accept4-syscall.patch @@ -0,0 +1,57 @@ +From 65cc21b4523e94d5640542a818748cd3be8cd6b4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=89meric=20Maschino?= +Date: Mon, 9 Jan 2012 12:55:10 -0800 +Subject: ia64: Add accept4() syscall +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Émeric Maschino + +commit 65cc21b4523e94d5640542a818748cd3be8cd6b4 upstream. + +While debugging udev > 170 failure on Debian Wheezy +(http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648325), it appears +that the issue was in fact due to missing accept4() in ia64. + +This patch simply adds accept4() to ia64. + +Signed-off-by: Émeric Maschino +Signed-off-by: Tony Luck +Signed-off-by: Jonathan Nieder +Signed-off-by: Greg Kroah-Hartman + + +--- + arch/ia64/include/asm/unistd.h | 3 ++- + arch/ia64/kernel/entry.S | 3 +++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +--- a/arch/ia64/include/asm/unistd.h ++++ b/arch/ia64/include/asm/unistd.h +@@ -321,11 +321,12 @@ + #define __NR_syncfs 1329 + #define __NR_setns 1330 + #define __NR_sendmmsg 1331 ++#define __NR_accept4 1334 + + #ifdef __KERNEL__ + + +-#define NR_syscalls 308 /* length of syscall table */ ++#define NR_syscalls 311 /* length of syscall table */ + + /* + * The following defines stop scripts/checksyscalls.sh from complaining about +--- a/arch/ia64/kernel/entry.S ++++ b/arch/ia64/kernel/entry.S +@@ -1777,6 +1777,9 @@ sys_call_table: + data8 sys_syncfs + data8 sys_setns // 1330 + data8 sys_sendmmsg ++ data8 sys_ni_syscall /* process_vm_readv */ ++ data8 sys_ni_syscall /* process_vm_writev */ ++ data8 sys_accept4 + + .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls + #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ diff --git a/queue-3.0/series b/queue-3.0/series index 04c640b1309..006089e2539 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -52,3 +52,4 @@ pch_gbe-support-ml7831-ioh.patch pch_gbe-fixed-the-issue-on-which-pc-was-frozen-when-link-was-downed.patch pch_gbe-do-not-abort-probe-on-bad-mac.patch pch_gbe-memory-corruption-calling-pch_gbe_validate_option.patch +ia64-add-accept4-syscall.patch