From patchwork Mon Dec 6 15:48:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guy Martin X-Patchwork-Id: 378552 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB6FjxlP023878 for ; Mon, 6 Dec 2010 15:48:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751425Ab0LFPsP (ORCPT ); Mon, 6 Dec 2010 10:48:15 -0500 Received: from bente.schedom-europe.net ([193.109.184.68]:58443 "EHLO bente.schedom-europe.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750774Ab0LFPsO (ORCPT ); Mon, 6 Dec 2010 10:48:14 -0500 Received: (qmail 22423 invoked by uid 507); 6 Dec 2010 16:48:11 +0100 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bente.schedom-europe.net X-Spam-Level: *********** X-Spam-Status: No, score=11.2 required=15.0 tests=BAYES_99, FH_DATE_PAST_20XX, RCVD_IN_PBL,RDNS_DYNAMIC autolearn=disabled version=3.2.5 Received: from ip115.dyn1.liege.schedom-europe.net (HELO ibiza.bxl.tuxicoman.be) (83.101.5.115) by bente.schedom-europe.net with SMTP; 6 Dec 2010 16:48:06 +0100 Received: from borg.bxl.tuxicoman.be ([2001:6f8:310:301::1]) by ibiza.bxl.tuxicoman.be with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1PPdIL-0005ie-FH for linux-parisc@vger.kernel.org; Mon, 06 Dec 2010 16:48:05 +0100 Date: Mon, 6 Dec 2010 16:48:04 +0100 From: Guy Martin To: linux-parisc@vger.kernel.org Subject: [PATCH] parisc : Remove broken line wrapping handling pdc_iodc_print() Message-ID: <20101206164804.1dd8765e@borg.bxl.tuxicoman.be> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; x86_64-pc-linux-gnu) Mime-Version: 1.0 Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 06 Dec 2010 15:48:15 +0000 (UTC) --- arch/parisc/kernel/firmware.c.orig 2010-12-05 16:42:07.000000000 +0100 +++ arch/parisc/kernel/firmware.c 2010-12-05 17:32:52.000000000 +0100 @@ -1126,15 +1126,13 @@ unsigned int i; unsigned long flags; - for (i = 0; i < count && i < 79;) { + for (i = 0; i < count;) { switch(str[i]) { case '\n': iodc_dbuf[i+0] = '\r'; iodc_dbuf[i+1] = '\n'; i += 2; goto print; - case '\b': /* BS */ - i--; /* overwrite last */ default: iodc_dbuf[i] = str[i]; i++; @@ -1142,15 +1140,6 @@ } } - /* if we're at the end of line, and not already inserting a newline, - * insert one anyway. iodc console doesn't claim to support >79 char - * lines. don't account for this in the return value. - */ - if (i == 79 && iodc_dbuf[i-1] != '\n') { - iodc_dbuf[i+0] = '\r'; - iodc_dbuf[i+1] = '\n'; - } - print: spin_lock_irqsave(&pdc_lock, flags); real32_call(PAGE0->mem_cons.iodc_io,