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 1JqwSL-0005ga-7K for user-mode-linux-devel@lists.sourceforge.net; Tue, 29 Apr 2008 13:29:41 -0700 Received: from saraswathi.solana.com ([198.99.130.12]) by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256) (Exim 4.44) id 1JqwSK-0005tp-I0 for user-mode-linux-devel@lists.sourceforge.net; Tue, 29 Apr 2008 13:29:41 -0700 Date: Tue, 29 Apr 2008 16:29:25 -0400 From: Jeff Dike Message-ID: <20080429202924.GA13602@c2.user-mode-linux.org> References: <20080425175613.GA11192@c2.user-mode-linux.org> <877iegcx11.fsf@hades.wkstn.nix> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <877iegcx11.fsf@hades.wkstn.nix> 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: Nix Cc: Andrew Morton , LKML , uml-devel T24gVHVlLCBBcHIgMjksIDIwMDggYXQgMDc6NTQ6MDJQTSArMDEwMCwgTml4IHdyb3RlOgo+IE9u IDI1IEFwciAyMDA4LCBKZWZmIERpa2Ugc3RhdGVkLCBpbiBwYXJ0Ogo+ID4gSW5kZXg6IGxpbnV4 LTIuNi1naXQvYXJjaC91bS9vcy1MaW51eC90aW1lLmMKPiA+ID09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KPiA+IC0tLSBs aW51eC0yLjYtZ2l0Lm9yaWcvYXJjaC91bS9vcy1MaW51eC90aW1lLmMJMjAwOC0wNC0yNSAxMDo0 MjoxMi4wMDAwMDAwMDAgLTA0MDAKPiA+ICsrKyBsaW51eC0yLjYtZ2l0L2FyY2gvdW0vb3MtTGlu dXgvdGltZS5jCTIwMDgtMDQtMjUgMTE6MTk6MjYuMDAwMDAwMDAwIC0wNDAwCj4gPiArCWFsYXJt X2hhbmRsZXIoU0lHVlRBTFJNLCBOVUxMKTsKPiA+ICsJCWFsYXJtX2hhbmRsZXIoU0lHVlRBTFJN LCBOVUxMKTsKPiA+IC1leHRlcm4gdm9pZCBhbGFybV9oYW5kbGVyKGludCBzaWcsIHN0cnVjdCBz aWdjb250ZXh0ICpzYyk7Cj4gPiAtCQlhbGFybV9oYW5kbGVyKFNJR1ZUQUxSTSwgTlVMTCk7Cj4g Cj4gWWV0LCBpbiBhcmNoL3VtL2luY2x1ZGUvcHJvY2Vzcy5oLCB3ZSBzZWUsIHVuY2hhbmdlZCBz aW5jZSB0aGUgeWVhciBkb3QsIHRoZQo+IG9idmlvdXNseSB3cm9uZyBwcm90b3R5cGU6Cj4gCj4g ZXh0ZXJuIHZvaWQgYWxhcm1faGFuZGxlcihpbnQgc2lnLCBzdHJ1Y3Qgc2lnY29udGV4dCBzYyk7 Cj4gCj4gSGVuY2U6Cj4gCj4gICBDQyAgICAgIGFyY2gvdW0vb3MtTGludXgvdGltZS5vCj4gYXJj aC91bS9vcy1MaW51eC90aW1lLmM6IEluIGZ1bmN0aW9uIOKAmGRlbGl2ZXJfYWxhcm3igJk6Cj4g YXJjaC91bS9vcy1MaW51eC90aW1lLmM6MTE5OiBlcnJvcjogaW5jb21wYXRpYmxlIHR5cGUgZm9y IGFyZ3VtZW50IDIgb2Yg4oCYYWxhcm1faGFuZGxlcuKAmQo+IG1ha2VbMV06ICoqKiBbYXJjaC91 bS9vcy1MaW51eC90aW1lLm9dIEVycm9yIDEKPiBtYWtlOiAqKiogW2FyY2gvdW0vb3MtTGludXhd IEVycm9yIDIKPiAKPiBGaXggdHJpdmlhbDoKPiAKPiBTaWduZWQtb2ZmLWJ5OiBOaWNrIEFsY29j ayA8bml4QGVzcGVyaS5vcmcudWs+Cj4gLS0gCj4gSW5kZXg6IGxpbnV4L2FyY2gvdW0vaW5jbHVk ZS9wcm9jZXNzLmgKPiA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Cj4gLS0tIGxpbnV4Lm9yaWcvYXJjaC91bS9pbmNsdWRl L3Byb2Nlc3MuaAkyMDA2LTA3LTA5IDE0OjE5OjUyLjAwMDAwMDAwMCArMDEwMAo+ICsrKyBsaW51 eC9hcmNoL3VtL2luY2x1ZGUvcHJvY2Vzcy5oCTIwMDgtMDQtMjkgMTk6NDk6NDkuMDAwMDAwMDAw ICswMTAwCj4gQEAgLTgsOCArOCw4IEBACj4gIAo+ICAjaW5jbHVkZSA8c2lnbmFsLmg+Cj4gIAo+ IC1leHRlcm4gdm9pZCBzaWdfaGFuZGxlcihpbnQgc2lnLCBzdHJ1Y3Qgc2lnY29udGV4dCBzYyk7 Cj4gLWV4dGVybiB2b2lkIGFsYXJtX2hhbmRsZXIoaW50IHNpZywgc3RydWN0IHNpZ2NvbnRleHQg c2MpOwo+ICtleHRlcm4gdm9pZCBzaWdfaGFuZGxlcihpbnQgc2lnLCBzdHJ1Y3Qgc2lnY29udGV4 dCAqc2MpOwo+ICtleHRlcm4gdm9pZCBhbGFybV9oYW5kbGVyKGludCBzaWcsIHN0cnVjdCBzaWdj b250ZXh0ICpzYyk7Cj4gIAo+ICAjZW5kaWYKCkNyYXAsIEkgZml4ZWQgdGhhdCwgYnV0IGZvcmdv dCB0byBxdWlsdCBhZGQgaXQsIEkgZ3Vlc3MuCgpBQ0suCgoJCQlKZWZmCgotLSAKV29yayBlbWFp bCAtIGpkaWtlIGF0IGxpbnV4IGRvdCBpbnRlbCBkb3QgY29tCgotLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tClRo aXMgU0YubmV0IGVtYWlsIGlzIHNwb25zb3JlZCBieSB0aGUgMjAwOCBKYXZhT25lKFNNKSBDb25m ZXJlbmNlIApEb24ndCBtaXNzIHRoaXMgeWVhcidzIGV4Y2l0aW5nIGV2ZW50LiBUaGVyZSdzIHN0 aWxsIHRpbWUgdG8gc2F2ZSAkMTAwLiAKVXNlIHByaW9yaXR5IGNvZGUgSjhUTDJEMi4gCmh0dHA6 Ly9hZC5kb3VibGVjbGljay5uZXQvY2xrOzE5ODc1NzY3MzsxMzUwMzAzODtwP2h0dHA6Ly9qYXZh LnN1bi5jb20vamF2YW9uZQpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpVc2VyLW1vZGUtbGludXgtZGV2ZWwgbWFpbGluZyBsaXN0ClVzZXItbW9kZS1saW51 eC1kZXZlbEBsaXN0cy5zb3VyY2Vmb3JnZS5uZXQKaHR0cHM6Ly9saXN0cy5zb3VyY2Vmb3JnZS5u ZXQvbGlzdHMvbGlzdGluZm8vdXNlci1tb2RlLWxpbnV4LWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762902AbYD2Ual (ORCPT ); Tue, 29 Apr 2008 16:30:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757091AbYD2Uad (ORCPT ); Tue, 29 Apr 2008 16:30:33 -0400 Received: from [198.99.130.12] ([198.99.130.12]:42655 "EHLO saraswathi.solana.com" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1756678AbYD2Uac (ORCPT ); Tue, 29 Apr 2008 16:30:32 -0400 Date: Tue, 29 Apr 2008 16:29:25 -0400 From: Jeff Dike To: Nix Cc: Andrew Morton , LKML , uml-devel Subject: Re: [PATCH 11/19] UML - Track and make up lost ticks Message-ID: <20080429202924.GA13602@c2.user-mode-linux.org> References: <20080425175613.GA11192@c2.user-mode-linux.org> <877iegcx11.fsf@hades.wkstn.nix> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <877iegcx11.fsf@hades.wkstn.nix> User-Agent: Mutt/1.5.17 (2007-11-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Jeff -- Work email - jdike at linux dot intel dot com