From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.91] helo=mail.sourceforge.net) by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43) id 1KKyfz-0006u3-Dk for user-mode-linux-devel@lists.sourceforge.net; Mon, 21 Jul 2008 09:55:55 -0700 Received: from nf-out-0910.google.com ([64.233.182.186]) by mail.sourceforge.net with esmtp (Exim 4.44) id 1KKyfx-0003r1-Pr for user-mode-linux-devel@lists.sourceforge.net; Mon, 21 Jul 2008 09:55:55 -0700 Received: by nf-out-0910.google.com with SMTP id g16so417666nfd.2 for ; Mon, 21 Jul 2008 09:55:52 -0700 (PDT) Date: Mon, 21 Jul 2008 17:54:09 +0100 From: WANG Cong Message-ID: <20080721165409.GA9023@hack.voiplan.pt> MIME-Version: 1.0 Content-Disposition: inline Subject: [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: LKML Cc: jdike@addtoit.com, user-mode-linux-devel@lists.sourceforge.net CkZpeGVkIHRoaXMgYnVpbGQgZXJyb3I6CgovaG9tZS93YW5nY29uZy9Qcm9qZWN0cy9saW51eC0y LjYvYXJjaC91bS9kcml2ZXJzL2xpbmUuYzogSW4gZnVuY3Rpb24K4oCYbGluZV93cml0ZV9pbnRl cnJ1cHTigJk6Ci9ob21lL3dhbmdjb25nL1Byb2plY3RzL2xpbnV4LTIuNi9hcmNoL3VtL2RyaXZl cnMvbGluZS5jOjM2NjogZXJyb3I6CuKAmHN0cnVjdCB0dHlfbGRpc2PigJkgaGFzIG5vIG1lbWJl ciBuYW1lZCDigJh3cml0ZV93YWtldXDigJkKL2hvbWUvd2FuZ2NvbmcvUHJvamVjdHMvbGludXgt Mi42L2FyY2gvdW0vZHJpdmVycy9saW5lLmM6MzY3OiBlcnJvcjoK4oCYc3RydWN0IHR0eV9sZGlz Y+KAmSBoYXMgbm8gbWVtYmVyIG5hbWVkIOKAmHdyaXRlX3dha2V1cOKAmQptYWtlWzJdOiAqKiog W2FyY2gvdW0vZHJpdmVycy9saW5lLm9dIEVycm9yIDEKbWFrZVsxXTogKioqIFthcmNoL3VtL2Ry aXZlcnNdIEVycm9yIDIKbWFrZTogKioqIFtzdWItbWFrZV0gRXJyb3IgMgoKU2lnZW5kLW9mZi1i eTogV0FORyBDb25nIDx3YW5nY29uZ0B6ZXV1eC5vcmc+CkNjOiBqZGlrZUBhZGR0b2l0LmNvbQoK LS0tCmRpZmYgLS1naXQgYS9hcmNoL3VtL2RyaXZlcnMvbGluZS5jIGIvYXJjaC91bS9kcml2ZXJz L2xpbmUuYwppbmRleCA1MDQ3NDkwLi5jODcyZGFkIDEwMDY0NAotLS0gYS9hcmNoL3VtL2RyaXZl cnMvbGluZS5jCisrKyBiL2FyY2gvdW0vZHJpdmVycy9saW5lLmMKQEAgLTM2Myw4ICszNjMsOCBA QCBzdGF0aWMgaXJxcmV0dXJuX3QgbGluZV93cml0ZV9pbnRlcnJ1cHQoaW50IGlycSwgdm9pZCAq ZGF0YSkKIAkJcmV0dXJuIElSUV9OT05FOwogCiAJaWYgKHRlc3RfYml0KFRUWV9ET19XUklURV9X QUtFVVAsICZ0dHktPmZsYWdzKSAmJgotCSAgICh0dHktPmxkaXNjLndyaXRlX3dha2V1cCAhPSBO VUxMKSkKLQkJKHR0eS0+bGRpc2Mud3JpdGVfd2FrZXVwKSh0dHkpOworCSAgICh0dHktPmxkaXNj Lm9wcy0+d3JpdGVfd2FrZXVwICE9IE5VTEwpKQorCQkodHR5LT5sZGlzYy5vcHMtPndyaXRlX3dh a2V1cCkodHR5KTsKIAogCS8qCiAJICogQkxPQ0tJTkcgbW9kZQoKLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpU aGlzIFNGLk5ldCBlbWFpbCBpcyBzcG9uc29yZWQgYnkgdGhlIE1vYmxpbiBZb3VyIE1vdmUgRGV2 ZWxvcGVyJ3MgY2hhbGxlbmdlCkJ1aWxkIHRoZSBjb29sZXN0IExpbnV4IGJhc2VkIGFwcGxpY2F0 aW9ucyB3aXRoIE1vYmxpbiBTREsgJiB3aW4gZ3JlYXQgcHJpemVzCkdyYW5kIHByaXplIGlzIGEg dHJpcCBmb3IgdHdvIHRvIGFuIE9wZW4gU291cmNlIGV2ZW50IGFueXdoZXJlIGluIHRoZSB3b3Js ZApodHRwOi8vbW9ibGluLWNvbnRlc3Qub3JnL3JlZGlyZWN0LnBocD9iYW5uZXJfaWQ9MTAwJnVy bD0vCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClVzZXIt bW9kZS1saW51eC1kZXZlbCBtYWlsaW5nIGxpc3QKVXNlci1tb2RlLWxpbnV4LWRldmVsQGxpc3Rz LnNvdXJjZWZvcmdlLm5ldApodHRwczovL2xpc3RzLnNvdXJjZWZvcmdlLm5ldC9saXN0cy9saXN0 aW5mby91c2VyLW1vZGUtbGludXgtZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754002AbYGUQ4M (ORCPT ); Mon, 21 Jul 2008 12:56:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752632AbYGUQzz (ORCPT ); Mon, 21 Jul 2008 12:55:55 -0400 Received: from nf-out-0910.google.com ([64.233.182.188]:18054 "EHLO nf-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752548AbYGUQzx (ORCPT ); Mon, 21 Jul 2008 12:55:53 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:content-transfer-encoding:user-agent; b=FHoXYZQQ6nFmsbhbrd1gfKLl4xza8sAS00Pv1FSMMvuBBebYKdd6cWebxM7boD4BCR nMckoLtUiGaFOuj3woKPLJtQ6uoH1I2VyMKtlAuOksGd3+9CqMttjTP/iCcvk/bq55Ho seRBMKNUlKRx8zWn8Xym6mDv0Rvkidez0/cQc= Date: Mon, 21 Jul 2008 17:54:09 +0100 From: WANG Cong To: LKML Cc: user-mode-linux-devel@lists.sourceforge.net, jdike@addtoit.com Subject: [Patch] um: fix a build error Message-ID: <20080721165409.GA9023@hack.voiplan.pt> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fixed this build error: /home/wangcong/Projects/linux-2.6/arch/um/drivers/line.c: In function ‘line_write_interrupt’: /home/wangcong/Projects/linux-2.6/arch/um/drivers/line.c:366: error: ‘struct tty_ldisc’ has no member named ‘write_wakeup’ /home/wangcong/Projects/linux-2.6/arch/um/drivers/line.c:367: error: ‘struct tty_ldisc’ has no member named ‘write_wakeup’ make[2]: *** [arch/um/drivers/line.o] Error 1 make[1]: *** [arch/um/drivers] Error 2 make: *** [sub-make] Error 2 Sigend-off-by: WANG Cong Cc: jdike@addtoit.com --- diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index 5047490..c872dad 100644 --- a/arch/um/drivers/line.c +++ b/arch/um/drivers/line.c @@ -363,8 +363,8 @@ static irqreturn_t line_write_interrupt(int irq, void *data) return IRQ_NONE; if (test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags) && - (tty->ldisc.write_wakeup != NULL)) - (tty->ldisc.write_wakeup)(tty); + (tty->ldisc.ops->write_wakeup != NULL)) + (tty->ldisc.ops->write_wakeup)(tty); /* * BLOCKING mode