diff --git a/debian/changelog b/debian/changelog index 497ae6c1e..d5c420ebc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux-2.6 (3.1.0-1~experimental.2) experimental; urgency=low + + [ Ben Hutchings ] + * [alpha] wire up accept4 syscall, thanks to Michael Cree + + -- Ben Hutchings Fri, 04 Nov 2011 15:05:47 +0000 + linux-2.6 (3.1.0-1~experimental.1) experimental; urgency=low * New upstream release: http://kernelnewbies.org/Linux_3.1 diff --git a/debian/patches/bugfix/alpha/alpha-wire-up-accept4-syscall.patch b/debian/patches/bugfix/alpha/alpha-wire-up-accept4-syscall.patch new file mode 100644 index 000000000..a4334d366 --- /dev/null +++ b/debian/patches/bugfix/alpha/alpha-wire-up-accept4-syscall.patch @@ -0,0 +1,52 @@ +From: Michael Cree +Date: Mon, 31 Oct 2011 17:09:49 -0700 +Subject: [PATCH] alpha: wire up accept4 syscall + +commit 0a8c384ebe4cc1c462076732dbffb595e7e81d5c upstream. + +Somehow wiring up the accept4 syscall on Alpha was missed long ago. +This commit rectifies that oversight. + +Signed-off-by: Michael Cree +Reviewed-by: Matt Turner +Cc: Richard Henderson +Cc: Ivan Kokshaysky +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +--- + arch/alpha/include/asm/unistd.h | 3 ++- + arch/alpha/kernel/systbls.S | 1 + + 2 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/arch/alpha/include/asm/unistd.h b/arch/alpha/include/asm/unistd.h +index 4ac48a0..1fbfd64 100644 +--- a/arch/alpha/include/asm/unistd.h ++++ b/arch/alpha/include/asm/unistd.h +@@ -457,10 +457,11 @@ + #define __NR_clock_adjtime 499 + #define __NR_syncfs 500 + #define __NR_setns 501 ++#define __NR_accept4 502 + + #ifdef __KERNEL__ + +-#define NR_SYSCALLS 502 ++#define NR_SYSCALLS 503 + + #define __ARCH_WANT_IPC_PARSE_VERSION + #define __ARCH_WANT_OLD_READDIR +diff --git a/arch/alpha/kernel/systbls.S b/arch/alpha/kernel/systbls.S +index 6acea1f..53d0ce2 100644 +--- a/arch/alpha/kernel/systbls.S ++++ b/arch/alpha/kernel/systbls.S +@@ -520,6 +520,7 @@ sys_call_table: + .quad sys_clock_adjtime + .quad sys_syncfs /* 500 */ + .quad sys_setns ++ .quad sys_accept4 + + .size sys_call_table, . - sys_call_table + .type sys_call_table, @object +-- +1.7.7 + diff --git a/debian/patches/series/1~experimental.2 b/debian/patches/series/1~experimental.2 new file mode 100644 index 000000000..1178bbd80 --- /dev/null +++ b/debian/patches/series/1~experimental.2 @@ -0,0 +1 @@ ++ bugfix/alpha/alpha-wire-up-accept4-syscall.patch