Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751249AbVJXUBm (ORCPT ); Mon, 24 Oct 2005 16:01:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751253AbVJXUBm (ORCPT ); Mon, 24 Oct 2005 16:01:42 -0400 Received: from lakshmi.addtoit.com ([198.99.130.6]:49924 "EHLO lakshmi.solana.com") by vger.kernel.org with ESMTP id S1751249AbVJXUBm (ORCPT ); Mon, 24 Oct 2005 16:01:42 -0400 Date: Mon, 24 Oct 2005 15:54:07 -0400 From: Jeff Dike To: Miklos Szeredi Cc: akpm@osdl.org, linux-kernel@vger.kernel.org, blaisorblade@yahoo.it Subject: Re: [PATCH 2.6.14-rc5-mm1] UML: fix compile part-1 Message-ID: <20051024195407.GA9106@ccure.user-mode-linux.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.1i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 804 Lines: 21 On Mon, Oct 24, 2005 at 05:54:46PM +0200, Miklos Szeredi wrote: > This patch fixes the following compile error: > > CC arch/um/kernel/syscall_kern.o > In file included from arch/um/kernel/syscall_kern.c:22: > arch/um/include/sysdep/syscalls.h:14: error: conflicting types for `sys_ptrace' > include/linux/syscalls.h:494: error: previous declaration of `sys_ptrace' > > Don't know if it's the correct fix, but result seems to work fine for > me. > > Signed-off-by: Miklos Szeredi Acked-By: Jeff Dike Jeff - 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/