From owner-svn-src-projects@FreeBSD.ORG  Sun Apr 24 17:28:27 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C158E106566B;
	Sun, 24 Apr 2011 17:28:27 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B04CA8FC13;
	Sun, 24 Apr 2011 17:28:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p3OHSROd040770;
	Sun, 24 Apr 2011 17:28:27 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3OHSRMF040768;
	Sun, 24 Apr 2011 17:28:27 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201104241728.p3OHSRMF040768@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sun, 24 Apr 2011 17:28:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220996 - projects/altix/sys/ia64/include
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Apr 2011 17:28:27 -0000

Author: marcel
Date: Sun Apr 24 17:28:27 2011
New Revision: 220996
URL: http://svn.freebsd.org/changeset/base/220996

Log:
  We now have 8-byte wide bus-space accesses. Consequently, the lack of
  8-byte wide I/O port access support was causing build breakages. Just
  drop support for 8-byte wide I/O port accesses.

Modified:
  projects/altix/sys/ia64/include/bus.h

Modified: projects/altix/sys/ia64/include/bus.h
==============================================================================
--- projects/altix/sys/ia64/include/bus.h	Sun Apr 24 17:25:50 2011	(r220995)
+++ projects/altix/sys/ia64/include/bus.h	Sun Apr 24 17:28:27 2011	(r220996)
@@ -222,9 +222,8 @@ bus_space_read_8(bus_space_tag_t bst, bu
 {
 	uint64_t val;
 
-	val = (__predict_false(bst == IA64_BUS_SPACE_IO))
-	    ? bus_space_read_io_8(bsh + ofs)
-	    : ia64_ld8((void *)(bsh + ofs));
+	val = (__predict_false(bst == IA64_BUS_SPACE_IO)) ? ~0 :
+	    ia64_ld8((void *)(bsh + ofs));
 	return (val);
 }
 
@@ -277,9 +276,7 @@ bus_space_write_8(bus_space_tag_t bst, b
     uint64_t val)
 {
 
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_write_io_8(bsh + ofs, val);
-	else
+	if (__predict_true(bst != IA64_BUS_SPACE_IO))
 		ia64_st8((void *)(bsh + ofs), val);
 }