Return-Path: Delivered-To: lkml@kolivas.org Received: from bhhdoa.org.au (bhhdoa.org.au [216.17.101.199]) by mail.kolivas.org (Postfix) with ESMTP id B059C3E0C6 for ; Mon, 9 Aug 2004 09:20:11 +1000 (EST) Received: from vger.kernel.org (vger.kernel.org [12.107.209.244]) by bhhdoa.org.au (Postfix) with ESMTP id 1B78F50B5C for ; Sun, 8 Aug 2004 16:57:52 -0400 (EDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S265706AbUHHXSs (ORCPT ); Sun, 8 Aug 2004 19:18:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S265701AbUHHXSs (ORCPT ); Sun, 8 Aug 2004 19:18:48 -0400 Received: from fw.osdl.org ([65.172.181.6]:21702 "EHLO mail.osdl.org") by vger.kernel.org with ESMTP id S265706AbUHHXSn (ORCPT ); Sun, 8 Aug 2004 19:18:43 -0400 Received: from bix (build.pdx.osdl.net [172.20.1.2]) by mail.osdl.org (8.11.6/8.11.6) with SMTP id i78NId112451; Sun, 8 Aug 2004 16:18:40 -0700 Date: Sun, 8 Aug 2004 16:17:06 -0700 From: Andrew Morton To: Brice.Goglin@ens-lyon.fr, linux-kernel@vger.kernel.org Subject: Re: 2.6.8-rc3-mm2 Message-Id: <20040808161706.643bd7e8.akpm@osdl.org> In-Reply-To: <20040808160456.7706bc97.akpm@osdl.org> References: <20040808152936.1ce2eab8.akpm@osdl.org> <20040808225504.GD31602@ens-lyon.fr> <20040808160456.7706bc97.akpm@osdl.org> X-Mailer: Sylpheed version 0.9.7 (GTK+ 1.2.10; i386-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org Andrew Morton wrote: > > The below is probably wrongish, but it'll get you thorugh. This is the correct patch. diff -puN arch/i386/kernel/nmi.c~nmi-build-fix arch/i386/kernel/nmi.c --- 25/arch/i386/kernel/nmi.c~nmi-build-fix 2004-08-08 16:15:55.998033640 -0700 +++ 25-akpm/arch/i386/kernel/nmi.c 2004-08-08 16:15:56.003032880 -0700 @@ -549,13 +549,13 @@ static int unknown_nmi_panic_callback(st /* * proc handler for /proc/sys/kernel/unknown_nmi_panic */ -int proc_unknown_nmi_panic(ctl_table *table, int write, - struct file *file, void __user *buffer, size_t *length) +int proc_unknown_nmi_panic(ctl_table *table, int write, struct file *file, + void __user *buffer, size_t *length, loff_t *ppos) { int old_state; old_state = unknown_nmi_panic; - proc_dointvec(table, write, file, buffer, length); + proc_dointvec(table, write, file, buffer, length, ppos); if (!!old_state == !!unknown_nmi_panic) return 0; diff -puN kernel/sysctl.c~nmi-build-fix kernel/sysctl.c --- 25/kernel/sysctl.c~nmi-build-fix 2004-08-08 16:15:56.000033336 -0700 +++ 25-akpm/kernel/sysctl.c 2004-08-08 16:15:56.004032728 -0700 @@ -69,7 +69,7 @@ extern int printk_ratelimit_burst; #if defined(CONFIG_X86_LOCAL_APIC) && defined(__i386__) int unknown_nmi_panic; extern int proc_unknown_nmi_panic(ctl_table *, int, struct file *, - void __user *, size_t *); + void __user *, size_t *, loff_t *); #endif /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ _ - 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/