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 1KLFZX-0002iL-W1 for user-mode-linux-devel@lists.sourceforge.net; Tue, 22 Jul 2008 03:58:24 -0700 Received: from mail.gmx.net ([213.165.64.20]) by mail.sourceforge.net with smtp (Exim 4.44) id 1KLFZW-0000My-62 for user-mode-linux-devel@lists.sourceforge.net; Tue, 22 Jul 2008 03:58:23 -0700 Date: Tue, 22 Jul 2008 12:58:12 +0200 From: Eric Sesterhenn Message-ID: <20080722105812.GB5283@alice> MIME-Version: 1.0 Content-Disposition: inline Subject: Re: [uml-devel] [Patch] um: fix a build error 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: xiyou.wangcong@gmail.com Cc: user-mode-linux-devel@lists.sourceforge.net, jdike@addtoit.com, linux-kernel@vger.kernel.org, alan@lxorguk.ukuu.org.uk SSBqdXN0IHJhbiBhY3Jvc3MgdGhlIHNhbWUgYnVpbGQgZXJyb3IsIGRvZXMKc29tZXRoaW5nIGxp a2UgdGhpcyBsb29rIHJlYXNvbmFibGU/IE9ubHkgYnVpbGQKYW5kIGJvb3QgdGVzdGVkLgoKVGhp cyBmaXhlcyB0aGUgZm9sbG93aW5nIGJ1aWxkIGVycm9yOgoKICBDQyAgICAgIGFyY2gvdW0vZHJp dmVycy9saW5lLm8KICBhcmNoL3VtL2RyaXZlcnMvbGluZS5jOiBJbiBmdW5jdGlvbiDigJhsaW5l X3dyaXRlX2ludGVycnVwdOKAmToKICBhcmNoL3VtL2RyaXZlcnMvbGluZS5jOjM2NjogZXJyb3I6 IOKAmHN0cnVjdCB0dHlfbGRpc2PigJkgaGFzIG5vIG1lbWJlcgogIG5hbWVkIOKAmHdyaXRlX3dh a2V1cOKAmQogIGFyY2gvdW0vZHJpdmVycy9saW5lLmM6MzY3OiBlcnJvcjog4oCYc3RydWN0IHR0 eV9sZGlzY+KAmSBoYXMgbm8gbWVtYmVyCiAgbmFtZWQg4oCYd3JpdGVfd2FrZXVw4oCZCiAgbWFr ZVsxXTogKioqIFthcmNoL3VtL2RyaXZlcnMvbGluZS5vXSBFcnJvciAxCiAgbWFrZTogKioqIFth cmNoL3VtL2RyaXZlcnNdIEVycm9yIDIKCgpTaWduZWQtb2ZmLWJ5OiBFcmljIFNlc3Rlcmhlbm4g PHNuYWtlYnl0ZUBnbXguZGU+CgotLS0gbGludXgtMi42L2FyY2gvdW0vZHJpdmVycy9saW5lLmMu b3JpZwkyMDA4LTA3LTIyIDEyOjA2OjE3LjAwMDAwMDAwMCArMDIwMAorKysgbGludXgtMi42L2Fy Y2gvdW0vZHJpdmVycy9saW5lLmMJMjAwOC0wNy0yMiAxMjowNjo0OS4wMDAwMDAwMDAgKzAyMDAK QEAgLTM2MiwxMCArMzYyLDggQEAgc3RhdGljIGlycXJldHVybl90IGxpbmVfd3JpdGVfaW50ZXJy dXB0KAogCWlmICh0dHkgPT0gTlVMTCkKIAkJcmV0dXJuIElSUV9OT05FOwogCi0JaWYgKHRlc3Rf Yml0KFRUWV9ET19XUklURV9XQUtFVVAsICZ0dHktPmZsYWdzKSAmJgotCSAgICh0dHktPmxkaXNj LndyaXRlX3dha2V1cCAhPSBOVUxMKSkKLQkJKHR0eS0+bGRpc2Mud3JpdGVfd2FrZXVwKSh0dHkp OwotCisJaWYgKHRlc3RfYml0KFRUWV9ET19XUklURV9XQUtFVVAsICZ0dHktPmZsYWdzKSkKKwkJ dHR5X3dha2V1cCh0dHkpOwogCS8qCiAJICogQkxPQ0tJTkcgbW9kZQogCSAqIEluIGJsb2NraW5n IG1vZGUsIGV2ZXJ5dGhpbmcgc2xlZXBzIG9uIHR0eS0+d3JpdGVfd2FpdC4KCi0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0KVGhpcyBTRi5OZXQgZW1haWwgaXMgc3BvbnNvcmVkIGJ5IHRoZSBNb2JsaW4gWW91ciBN b3ZlIERldmVsb3BlcidzIGNoYWxsZW5nZQpCdWlsZCB0aGUgY29vbGVzdCBMaW51eCBiYXNlZCBh cHBsaWNhdGlvbnMgd2l0aCBNb2JsaW4gU0RLICYgd2luIGdyZWF0IHByaXplcwpHcmFuZCBwcml6 ZSBpcyBhIHRyaXAgZm9yIHR3byB0byBhbiBPcGVuIFNvdXJjZSBldmVudCBhbnl3aGVyZSBpbiB0 aGUgd29ybGQKaHR0cDovL21vYmxpbi1jb250ZXN0Lm9yZy9yZWRpcmVjdC5waHA/YmFubmVyX2lk PTEwMCZ1cmw9LwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpVc2VyLW1vZGUtbGludXgtZGV2ZWwgbWFpbGluZyBsaXN0ClVzZXItbW9kZS1saW51eC1kZXZl bEBsaXN0cy5zb3VyY2Vmb3JnZS5uZXQKaHR0cHM6Ly9saXN0cy5zb3VyY2Vmb3JnZS5uZXQvbGlz dHMvbGlzdGluZm8vdXNlci1tb2RlLWxpbnV4LWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754811AbYGVK6X (ORCPT ); Tue, 22 Jul 2008 06:58:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751998AbYGVK6Q (ORCPT ); Tue, 22 Jul 2008 06:58:16 -0400 Received: from mail.gmx.net ([213.165.64.20]:36932 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1750971AbYGVK6P convert rfc822-to-8bit (ORCPT ); Tue, 22 Jul 2008 06:58:15 -0400 X-Authenticated: #704063 X-Provags-ID: V01U2FsdGVkX19C86gPqKVCD3yydVzq1c9DnhlzXi4ATADX49B6oN HmolYoBaq2kAi7 Date: Tue, 22 Jul 2008 12:58:12 +0200 From: Eric Sesterhenn To: xiyou.wangcong@gmail.com Cc: alan@lxorguk.ukuu.org.uk, linux-kernel@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net, jdike@addtoit.com Subject: Re: [Patch] um: fix a build error Message-ID: <20080722105812.GB5283@alice> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8BIT X-Editor: Vim http://www.vim.org/ X-Info: http://www.snake-basket.de X-Operating-System: Linux/2.6.26 (x86_64) X-Uptime: 12:54:40 up 2:34, 1 user, load average: 0.09, 0.26, 0.49 User-Agent: Mutt/1.5.16 (2007-06-09) X-Y-GMX-Trusted: 0 X-FuHaFi: 0.52 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I just ran across the same build error, does something like this look reasonable? Only build and boot tested. This fixes the following build error: CC arch/um/drivers/line.o arch/um/drivers/line.c: In function ‘line_write_interrupt’: arch/um/drivers/line.c:366: error: ‘struct tty_ldisc’ has no member named ‘write_wakeup’ arch/um/drivers/line.c:367: error: ‘struct tty_ldisc’ has no member named ‘write_wakeup’ make[1]: *** [arch/um/drivers/line.o] Error 1 make: *** [arch/um/drivers] Error 2 Signed-off-by: Eric Sesterhenn --- linux-2.6/arch/um/drivers/line.c.orig 2008-07-22 12:06:17.000000000 +0200 +++ linux-2.6/arch/um/drivers/line.c 2008-07-22 12:06:49.000000000 +0200 @@ -362,10 +362,8 @@ static irqreturn_t line_write_interrupt( if (tty == NULL) return IRQ_NONE; - if (test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags) && - (tty->ldisc.write_wakeup != NULL)) - (tty->ldisc.write_wakeup)(tty); - + if (test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags)) + tty_wakeup(tty); /* * BLOCKING mode * In blocking mode, everything sleeps on tty->write_wait.