From owner-svn-src-projects@FreeBSD.ORG Sat Nov 9 19:52:03 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9446B91D; Sat, 9 Nov 2013 19:52:03 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 815362F9A; Sat, 9 Nov 2013 19:52:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA9Jq3fo015363; Sat, 9 Nov 2013 19:52:03 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA9Jq3KP015362; Sat, 9 Nov 2013 19:52:03 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201311091952.rA9Jq3KP015362@svn.freebsd.org> From: Marcel Moolenaar Date: Sat, 9 Nov 2013 19:52:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257894 - projects/altix2/sys/ia64/sgisn X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Nov 2013 19:52:03 -0000 Author: marcel Date: Sat Nov 9 19:52:03 2013 New Revision: 257894 URL: http://svnweb.freebsd.org/changeset/base/257894 Log: Use the right operator to get the bit shift form the entry. We were mistakenly clearing bit 0 in the corresponding 64-bit integral. Modified: projects/altix2/sys/ia64/sgisn/sgisn_pcib.c Modified: projects/altix2/sys/ia64/sgisn/sgisn_pcib.c ============================================================================== --- projects/altix2/sys/ia64/sgisn/sgisn_pcib.c Sat Nov 9 19:43:16 2013 (r257893) +++ projects/altix2/sys/ia64/sgisn/sgisn_pcib.c Sat Nov 9 19:52:03 2013 (r257894) @@ -781,7 +781,7 @@ sgisn_pcib_iommu_unmap(device_t bus, dev KASSERT(count <= 64, ("foo: count")); KASSERT((entry + count) <= PCIB_REG_ATE_SIZE, ("foo")); - bitshft = entry & 64; + bitshft = entry % 64; KASSERT(bitshft <= (64 - count), ("foo: bitshft")); bits = (count < 64) ? ((1UL << count) - 1UL) << bitshft : ~0UL; ate = entry / 64;