Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751366AbWBJUEj (ORCPT ); Fri, 10 Feb 2006 15:04:39 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751367AbWBJUEj (ORCPT ); Fri, 10 Feb 2006 15:04:39 -0500 Received: from mx1.redhat.com ([66.187.233.31]:16310 "EHLO mx1.redhat.com") by vger.kernel.org with ESMTP id S1751366AbWBJUEi (ORCPT ); Fri, 10 Feb 2006 15:04:38 -0500 Date: Fri, 10 Feb 2006 15:04:25 -0500 From: Dave Jones To: Linux Kernel Cc: torvalds@osdl.org Subject: Fix s390 build failure. Message-ID: <20060210200425.GA11913@redhat.com> Mail-Followup-To: Dave Jones , Linux Kernel , torvalds@osdl.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.1i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 956 Lines: 21 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 --- linux-2.6.15.noarch/arch/s390/kernel/compat_signal.c~ 2006-02-10 12:47:57.000000000 -0500 +++ linux-2.6.15.noarch/arch/s390/kernel/compat_signal.c 2006-02-10 12:48:05.000000000 -0500 @@ -196,7 +196,7 @@ sys32_sigaction(int sig, const struct ol } int -do_sigaction(int sig, const struct k_sigaction *act, struct k_sigaction *oact); +do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact); asmlinkage long sys32_rt_sigaction(int sig, const struct sigaction32 __user *act, - 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/