Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964849AbWB0Whn (ORCPT ); Mon, 27 Feb 2006 17:37:43 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932470AbWB0WgX (ORCPT ); Mon, 27 Feb 2006 17:36:23 -0500 Received: from 216-99-217-87.dsl.aracnet.com ([216.99.217.87]:24449 "EHLO sorel.sous-sol.org") by vger.kernel.org with ESMTP id S932380AbWB0Wby (ORCPT ); Mon, 27 Feb 2006 17:31:54 -0500 Message-Id: <20060227223347.377860000@sorel.sous-sol.org> References: <20060227223200.865548000@sorel.sous-sol.org> Date: Mon, 27 Feb 2006 14:32:14 -0800 From: Chris Wright To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk, Greg Kroah-Hartman Subject: [patch 14/39] [PATCH] Fix s390 build failure. Content-Disposition: inline; filename=fix-s390-build-failure.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1206 Lines: 34 -stable review patch. If anyone has any objections, please let us know. ------------------ arch/s390/kernel/compat_signal.c:199: error: conflicting types for 'do_sigaction' include/linux/sched.h:1115: error: previous declaration of 'do_sigaction' was here Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- arch/s390/kernel/compat_signal.c | 3 --- 1 files changed, 3 deletions(-) --- linux-2.6.15.4.orig/arch/s390/kernel/compat_signal.c +++ linux-2.6.15.4/arch/s390/kernel/compat_signal.c @@ -258,9 +258,6 @@ sys32_sigaction(int sig, const struct ol return ret; } -int -do_sigaction(int sig, const struct k_sigaction *act, struct k_sigaction *oact); - asmlinkage long sys32_rt_sigaction(int sig, const struct sigaction32 __user *act, struct sigaction32 __user *oact, size_t sigsetsize) -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/