Return-Path: <hawkes@jackhammer.engr.sgi.com>
Received: from localhost (bix [127.0.0.1])
by localhost.localdomain (8.12.10/8.12.10) with ESMTP id j82GSaHE031519
for <akpm@localhost>; Fri, 2 Sep 2005 09:28:37 -0700
Received: from bix [127.0.0.1]
by localhost with POP3 (fetchmail-6.2.0)
for akpm@localhost (single-drop); Fri, 02 Sep 2005 09:28:37 -0700 (PDT)
Received: from smtp.osdl.org (smtp.osdl.org [65.172.181.4])
by shell0.pdx.osdl.net (8.13.1/8.11.6) with ESMTP id j82GPJ1R017500
for <akpm@mail.gateway.osdl.net>; Fri, 2 Sep 2005 09:25:19 -0700
Received: from omx3.sgi.com (omx3-ext.sgi.com [192.48.171.20])
by smtp.osdl.org (8.12.8/8.12.8) with ESMTP id j82GPHBn031667
for <akpm@osdl.org>; Fri, 2 Sep 2005 09:25:18 -0700
Received: from internal-mail-relay.corp.sgi.com (internal-mail-relay.corp.sgi.com [198.149.32.51])
by omx3.sgi.com (8.12.11/8.12.9/linux-outbound_gateway-1.1) with ESMTP id j82H9YgJ017240;
Fri, 2 Sep 2005 10:09:34 -0700
Received: from jackhammer.engr.sgi.com (jackhammer.engr.sgi.com [192.102.97.126])
by internal-mail-relay.corp.sgi.com (8.12.9/8.12.10/SGI_generic_relay-1.2) with ESMTP id j82GPC2Z263095975;
Fri, 2 Sep 2005 09:25:12 -0700 (PDT)
Received: by jackhammer.engr.sgi.com (Postfix, from userid 7749)
id 01573A065AE; Fri, 2 Sep 2005 09:25:11 -0700 (PDT)
Date: Fri, 02 Sep 2005 09:25:11 -0700
To: alan@lxorguk.ukuu.org.uk, alan@redhat.com, akpm@osdl.org
Subject: 2.6.13-mm1 tty-layer-buffering-revamp.patch problem
Message-ID: <43187CE7.MailI551AH1AM@jackhammer.engr.sgi.com>
User-Agent: nail 10.6 11/15/03
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
From: hawkes@jackhammer.engr.sgi.com (John Hawkes)
Received-SPF: none (domain of hawkes@jackhammer.engr.sgi.com does not designate permitted sender hosts)
X-MIMEDefang-Filter: osdl$Revision: 1.115 $
X-Scanned-By: MIMEDefang 2.36
X-Spam-Checker-Version: SpamAssassin 3.0.2 (2004-11-16) on bix
X-Spam-Status: No, score=-1.7 required=2.0 tests=BAYES_00 autolearn=ham
version=3.0.2
X-Spam-Level:
Alan Cox's tty-layer-buffering-revamp.patch in 2.6.13-mm1 won't build for
ia64/SN. I don't know if this is the correct fix, functionally speaking,
but at least this allows 2.6.13-mm1 to build for SGI's SN systems:
Signed-off-by: John Hawkes <hawkes@sgi.com>
Index: linux/drivers/serial/ioc4_serial.c
===================================================================
--- linux.orig/drivers/serial/ioc4_serial.c 2005-09-02 08:56:20.000000000 -0700
+++ linux/drivers/serial/ioc4_serial.c 2005-09-02 09:10:19.000000000 -0700
@@ -2331,7 +2331,7 @@
tty = info->tty;
- request_count = tty_request_room(tty, IOC4_MAX_CHARS - 2);
+ request_count = tty_buffer_request_room(tty, IOC4_MAX_CHARS - 2);
if (request_count > 0) {
icount = &the_port->icount;