From owner-svn-src-head@FreeBSD.ORG  Thu Nov  8 23:21:03 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 1AFC88F9;
 Thu,  8 Nov 2012 23:21:03 +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 F39938FC14;
 Thu,  8 Nov 2012 23:21:02 +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 qA8NL2LN046369;
 Thu, 8 Nov 2012 23:21:02 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA8NL2hT046367;
 Thu, 8 Nov 2012 23:21:02 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201211082321.qA8NL2hT046367@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 8 Nov 2012 23:21:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242804 - head/sys/boot/i386/boot2
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Nov 2012 23:21:03 -0000

Author: dim
Date: Thu Nov  8 23:21:02 2012
New Revision: 242804
URL: http://svnweb.freebsd.org/changeset/base/242804

Log:
  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
  MFC after:	3 days

Modified:
  head/sys/boot/i386/boot2/sio.S

Modified: head/sys/boot/i386/boot2/sio.S
==============================================================================
--- head/sys/boot/i386/boot2/sio.S	Thu Nov  8 23:11:59 2012	(r242803)
+++ head/sys/boot/i386/boot2/sio.S	Thu Nov  8 23:21:02 2012	(r242804)
@@ -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