From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sc8-sf-mx2-b.sourceforge.net ([10.3.1.92] helo=mail.sourceforge.net) by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43) id 1JtU4o-0006TT-CT for user-mode-linux-devel@lists.sourceforge.net; Tue, 06 May 2008 13:47:54 -0700 Received: from smtp1.linux-foundation.org ([140.211.169.13]) by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256) (Exim 4.44) id 1JtU4k-0000Gz-TA for user-mode-linux-devel@lists.sourceforge.net; Tue, 06 May 2008 13:47:54 -0700 Date: Tue, 6 May 2008 13:46:55 -0700 From: Andrew Morton Message-Id: <20080506134655.4cac1014.akpm@linux-foundation.org> In-Reply-To: <20080429202924.GA13602@c2.user-mode-linux.org> References: <20080425175613.GA11192@c2.user-mode-linux.org> <877iegcx11.fsf@hades.wkstn.nix> <20080429202924.GA13602@c2.user-mode-linux.org> Mime-Version: 1.0 Subject: Re: [uml-devel] [PATCH 11/19] UML - Track and make up lost ticks List-Id: The user-mode Linux development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: user-mode-linux-devel-bounces@lists.sourceforge.net Errors-To: user-mode-linux-devel-bounces@lists.sourceforge.net To: Jeff Dike Cc: nix@esperi.org.uk, linux-kernel@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net T24gVHVlLCAyOSBBcHIgMjAwOCAxNjoyOToyNSAtMDQwMApKZWZmIERpa2UgPGpkaWtlQGFkZHRv aXQuY29tPiB3cm90ZToKCj4gT24gVHVlLCBBcHIgMjksIDIwMDggYXQgMDc6NTQ6MDJQTSArMDEw MCwgTml4IHdyb3RlOgo+ID4gT24gMjUgQXByIDIwMDgsIEplZmYgRGlrZSBzdGF0ZWQsIGluIHBh cnQ6Cj4gPiA+IEluZGV4OiBsaW51eC0yLjYtZ2l0L2FyY2gvdW0vb3MtTGludXgvdGltZS5jCj4g PiA+ID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KPiA+ID4gLS0tIGxpbnV4LTIuNi1naXQub3JpZy9hcmNoL3VtL29zLUxp bnV4L3RpbWUuYwkyMDA4LTA0LTI1IDEwOjQyOjEyLjAwMDAwMDAwMCAtMDQwMAo+ID4gPiArKysg bGludXgtMi42LWdpdC9hcmNoL3VtL29zLUxpbnV4L3RpbWUuYwkyMDA4LTA0LTI1IDExOjE5OjI2 LjAwMDAwMDAwMCAtMDQwMAo+ID4gPiArCWFsYXJtX2hhbmRsZXIoU0lHVlRBTFJNLCBOVUxMKTsK PiA+ID4gKwkJYWxhcm1faGFuZGxlcihTSUdWVEFMUk0sIE5VTEwpOwo+ID4gPiAtZXh0ZXJuIHZv aWQgYWxhcm1faGFuZGxlcihpbnQgc2lnLCBzdHJ1Y3Qgc2lnY29udGV4dCAqc2MpOwo+ID4gPiAt CQlhbGFybV9oYW5kbGVyKFNJR1ZUQUxSTSwgTlVMTCk7Cj4gPiAKPiA+IFlldCwgaW4gYXJjaC91 bS9pbmNsdWRlL3Byb2Nlc3MuaCwgd2Ugc2VlLCB1bmNoYW5nZWQgc2luY2UgdGhlIHllYXIgZG90 LCB0aGUKPiA+IG9idmlvdXNseSB3cm9uZyBwcm90b3R5cGU6Cj4gPiAKPiA+IGV4dGVybiB2b2lk IGFsYXJtX2hhbmRsZXIoaW50IHNpZywgc3RydWN0IHNpZ2NvbnRleHQgc2MpOwo+ID4gCj4gPiBI ZW5jZToKPiA+IAo+ID4gICBDQyAgICAgIGFyY2gvdW0vb3MtTGludXgvdGltZS5vCj4gPiBhcmNo L3VtL29zLUxpbnV4L3RpbWUuYzogSW4gZnVuY3Rpb24g4oCYZGVsaXZlcl9hbGFybeKAmToKPiA+ IGFyY2gvdW0vb3MtTGludXgvdGltZS5jOjExOTogZXJyb3I6IGluY29tcGF0aWJsZSB0eXBlIGZv ciBhcmd1bWVudCAyIG9mIOKAmGFsYXJtX2hhbmRsZXLigJkKPiA+IG1ha2VbMV06ICoqKiBbYXJj aC91bS9vcy1MaW51eC90aW1lLm9dIEVycm9yIDEKPiA+IG1ha2U6ICoqKiBbYXJjaC91bS9vcy1M aW51eF0gRXJyb3IgMgo+ID4gCj4gPiBGaXggdHJpdmlhbDoKPiA+IAo+ID4gU2lnbmVkLW9mZi1i eTogTmljayBBbGNvY2sgPG5peEBlc3Blcmkub3JnLnVrPgo+ID4gLS0gCj4gPiBJbmRleDogbGlu dXgvYXJjaC91bS9pbmNsdWRlL3Byb2Nlc3MuaAo+ID4gPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQo+ID4gLS0tIGxpbnV4 Lm9yaWcvYXJjaC91bS9pbmNsdWRlL3Byb2Nlc3MuaAkyMDA2LTA3LTA5IDE0OjE5OjUyLjAwMDAw MDAwMCArMDEwMAo+ID4gKysrIGxpbnV4L2FyY2gvdW0vaW5jbHVkZS9wcm9jZXNzLmgJMjAwOC0w NC0yOSAxOTo0OTo0OS4wMDAwMDAwMDAgKzAxMDAKPiA+IEBAIC04LDggKzgsOCBAQAo+ID4gIAo+ ID4gICNpbmNsdWRlIDxzaWduYWwuaD4KPiA+ICAKPiA+IC1leHRlcm4gdm9pZCBzaWdfaGFuZGxl cihpbnQgc2lnLCBzdHJ1Y3Qgc2lnY29udGV4dCBzYyk7Cj4gPiAtZXh0ZXJuIHZvaWQgYWxhcm1f aGFuZGxlcihpbnQgc2lnLCBzdHJ1Y3Qgc2lnY29udGV4dCBzYyk7Cj4gPiArZXh0ZXJuIHZvaWQg c2lnX2hhbmRsZXIoaW50IHNpZywgc3RydWN0IHNpZ2NvbnRleHQgKnNjKTsKPiA+ICtleHRlcm4g dm9pZCBhbGFybV9oYW5kbGVyKGludCBzaWcsIHN0cnVjdCBzaWdjb250ZXh0ICpzYyk7Cj4gPiAg Cj4gPiAgI2VuZGlmCj4gCj4gQ3JhcCwgSSBmaXhlZCB0aGF0LCBidXQgZm9yZ290IHRvIHF1aWx0 IGFkZCBpdCwgSSBndWVzcy4KPiAKPiBBQ0suCj4gCgpUaGlzIGZpeCB3YXMgYWxyZWFkeSBwcmVz ZW50IGluIHlvdXIgIltQQVRDSCA0LzE5XSBVTUwgLSBSYW5kb20gZHJpdmVyIGZpeGVzIi4KClBl cmhhcHMgd2UgYnJva2UgYmlzZWN0aW9uPwoKLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpUaGlzIFNGLm5ldCBl bWFpbCBpcyBzcG9uc29yZWQgYnkgdGhlIDIwMDggSmF2YU9uZShTTSkgQ29uZmVyZW5jZSAKRG9u J3QgbWlzcyB0aGlzIHllYXIncyBleGNpdGluZyBldmVudC4gVGhlcmUncyBzdGlsbCB0aW1lIHRv IHNhdmUgJDEwMC4gClVzZSBwcmlvcml0eSBjb2RlIEo4VEwyRDIuIApodHRwOi8vYWQuZG91Ymxl Y2xpY2submV0L2NsazsxOTg3NTc2NzM7MTM1MDMwMzg7cD9odHRwOi8vamF2YS5zdW4uY29tL2ph dmFvbmUKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KVXNl ci1tb2RlLWxpbnV4LWRldmVsIG1haWxpbmcgbGlzdApVc2VyLW1vZGUtbGludXgtZGV2ZWxAbGlz dHMuc291cmNlZm9yZ2UubmV0Cmh0dHBzOi8vbGlzdHMuc291cmNlZm9yZ2UubmV0L2xpc3RzL2xp c3RpbmZvL3VzZXItbW9kZS1saW51eC1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933079AbYEFUsO (ORCPT ); Tue, 6 May 2008 16:48:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760745AbYEFUr4 (ORCPT ); Tue, 6 May 2008 16:47:56 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:57385 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758495AbYEFUry (ORCPT ); Tue, 6 May 2008 16:47:54 -0400 Date: Tue, 6 May 2008 13:46:55 -0700 From: Andrew Morton To: Jeff Dike Cc: nix@esperi.org.uk, linux-kernel@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net Subject: Re: [PATCH 11/19] UML - Track and make up lost ticks Message-Id: <20080506134655.4cac1014.akpm@linux-foundation.org> In-Reply-To: <20080429202924.GA13602@c2.user-mode-linux.org> References: <20080425175613.GA11192@c2.user-mode-linux.org> <877iegcx11.fsf@hades.wkstn.nix> <20080429202924.GA13602@c2.user-mode-linux.org> X-Mailer: Sylpheed version 2.2.4 (GTK+ 2.8.20; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 29 Apr 2008 16:29:25 -0400 Jeff Dike wrote: > On Tue, Apr 29, 2008 at 07:54:02PM +0100, Nix wrote: > > On 25 Apr 2008, Jeff Dike stated, in part: > > > Index: linux-2.6-git/arch/um/os-Linux/time.c > > > =================================================================== > > > --- linux-2.6-git.orig/arch/um/os-Linux/time.c 2008-04-25 10:42:12.000000000 -0400 > > > +++ linux-2.6-git/arch/um/os-Linux/time.c 2008-04-25 11:19:26.000000000 -0400 > > > + alarm_handler(SIGVTALRM, NULL); > > > + alarm_handler(SIGVTALRM, NULL); > > > -extern void alarm_handler(int sig, struct sigcontext *sc); > > > - alarm_handler(SIGVTALRM, NULL); > > > > Yet, in arch/um/include/process.h, we see, unchanged since the year dot, the > > obviously wrong prototype: > > > > extern void alarm_handler(int sig, struct sigcontext sc); > > > > Hence: > > > > CC arch/um/os-Linux/time.o > > arch/um/os-Linux/time.c: In function ‘deliver_alarm’: > > arch/um/os-Linux/time.c:119: error: incompatible type for argument 2 of ‘alarm_handler’ > > make[1]: *** [arch/um/os-Linux/time.o] Error 1 > > make: *** [arch/um/os-Linux] Error 2 > > > > Fix trivial: > > > > Signed-off-by: Nick Alcock > > -- > > Index: linux/arch/um/include/process.h > > =================================================================== > > --- linux.orig/arch/um/include/process.h 2006-07-09 14:19:52.000000000 +0100 > > +++ linux/arch/um/include/process.h 2008-04-29 19:49:49.000000000 +0100 > > @@ -8,8 +8,8 @@ > > > > #include > > > > -extern void sig_handler(int sig, struct sigcontext sc); > > -extern void alarm_handler(int sig, struct sigcontext sc); > > +extern void sig_handler(int sig, struct sigcontext *sc); > > +extern void alarm_handler(int sig, struct sigcontext *sc); > > > > #endif > > Crap, I fixed that, but forgot to quilt add it, I guess. > > ACK. > This fix was already present in your "[PATCH 4/19] UML - Random driver fixes". Perhaps we broke bisection?