From: Greg Kroah-Hartman Date: Tue, 20 May 2014 03:15:07 +0000 (+0900) Subject: 3.10-stable patches X-Git-Tag: v3.10.41~18 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e4d636de2ee693fcecb7b12c8722689431a4028;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: parisc-fix-epoll_pwait-syscall-on-compat-kernel.patch --- diff --git a/queue-3.10/parisc-fix-epoll_pwait-syscall-on-compat-kernel.patch b/queue-3.10/parisc-fix-epoll_pwait-syscall-on-compat-kernel.patch new file mode 100644 index 00000000000..50251cb7971 --- /dev/null +++ b/queue-3.10/parisc-fix-epoll_pwait-syscall-on-compat-kernel.patch @@ -0,0 +1,30 @@ +From ab3e55b119c9653b19ea4edffb86f04db867ac98 Mon Sep 17 00:00:00 2001 +From: Helge Deller +Date: Sun, 13 Apr 2014 00:03:55 +0200 +Subject: parisc: fix epoll_pwait syscall on compat kernel + +From: Helge Deller + +commit ab3e55b119c9653b19ea4edffb86f04db867ac98 upstream. + +This bug was detected with the libio-epoll-perl debian package where the +test case IO-Ppoll-compat.t failed. + +Signed-off-by: Helge Deller +Signed-off-by: Greg Kroah-Hartman + +--- + arch/parisc/kernel/syscall_table.S | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/parisc/kernel/syscall_table.S ++++ b/arch/parisc/kernel/syscall_table.S +@@ -392,7 +392,7 @@ + ENTRY_COMP(vmsplice) + ENTRY_COMP(move_pages) /* 295 */ + ENTRY_SAME(getcpu) +- ENTRY_SAME(epoll_pwait) ++ ENTRY_COMP(epoll_pwait) + ENTRY_COMP(statfs64) + ENTRY_COMP(fstatfs64) + ENTRY_COMP(kexec_load) /* 300 */ diff --git a/queue-3.10/series b/queue-3.10/series index 7d6566b3eb6..bb8e8e72906 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -12,3 +12,4 @@ arm-multi_v7_defconfig-enable-arm_atag_dtb_compat.patch rbd-fix-error-paths-in-rbd_img_request_fill.patch powerpc-add-vr-save-restore-functions.patch tgafb-fix-mode-setting-with-fbset.patch +parisc-fix-epoll_pwait-syscall-on-compat-kernel.patch diff --git a/queue-3.4/series b/queue-3.4/series new file mode 100644 index 00000000000..0ca9bb31de0 --- /dev/null +++ b/queue-3.4/series @@ -0,0 +1 @@ +parisc-fix-epoll_pwait-syscall-on-compat-kernel.patch