From owner-svn-src-all@FreeBSD.ORG  Mon Nov 12 07:30:24 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8E2C7ECD;
 Mon, 12 Nov 2012 07:30:24 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6F2468FC0C;
 Mon, 12 Nov 2012 07:30:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAC7UOrA076107;
 Mon, 12 Nov 2012 07:30:24 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAC7UOH3076106;
 Mon, 12 Nov 2012 07:30:24 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201211120730.qAC7UOH3076106@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 12 Nov 2012 07:30:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r242907 - stable/9/sys/boot/i386/boot2
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 07:30:24 -0000

Author: dim
Date: Mon Nov 12 07:30:24 2012
New Revision: 242907
URL: http://svnweb.freebsd.org/changeset/base/242907

Log:
  MFC r242804:
  
  Shrink boot2 by 8 bytes, by eliminating some unneeded instructions in
  sio.S.  This is not particularly needed for head right now, but it is
  intended to merge to stable/9, to fix boot2 build with clang there.
  
  Reviewed by:	avg

Modified:
  stable/9/sys/boot/i386/boot2/sio.S
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/boot/   (props changed)

Modified: stable/9/sys/boot/i386/boot2/sio.S
==============================================================================
--- stable/9/sys/boot/i386/boot2/sio.S	Mon Nov 12 07:25:51 2012	(r242906)
+++ stable/9/sys/boot/i386/boot2/sio.S	Mon Nov 12 07:30:24 2012	(r242907)
@@ -40,13 +40,11 @@ sio_init:	pushl %eax
 		movb $0x3,%al			# Set RTS,
 		outb %al,(%dx)			#  DTR
 		incl %edx			# Line status reg
-		call sio_flush
-		ret
+		# Fallthrough
 
 /* int sio_flush(void) */
 
-sio_flush:	xorl %eax,%eax			# Return value
-		xorl %ecx,%ecx			# Timeout
+sio_flush:	xorl %ecx,%ecx			# Timeout
 		movb $0x80,%ch			#  counter
 sio_flush.1:	call sio_ischar 		# Check for character
 		jz sio_flush.2			# Till none