From owner-svn-src-all@FreeBSD.ORG Thu Nov 17 15:48:13 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 425F01065673; Thu, 17 Nov 2011 15:48:13 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 31EA98FC18; Thu, 17 Nov 2011 15:48:13 +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 pAHFmDUS015619; Thu, 17 Nov 2011 15:48:13 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAHFmDUl015617; Thu, 17 Nov 2011 15:48:13 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201111171548.pAHFmDUl015617@svn.freebsd.org> From: Nathan Whitehorn Date: Thu, 17 Nov 2011 15:48:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227627 - head/sys/powerpc/aim X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Nov 2011 15:48:13 -0000 Author: nwhitehorn Date: Thu Nov 17 15:48:12 2011 New Revision: 227627 URL: http://svn.freebsd.org/changeset/base/227627 Log: Add an extra invariant here which was useful on 64-bit CPUs. Modified: head/sys/powerpc/aim/mmu_oea.c Modified: head/sys/powerpc/aim/mmu_oea.c ============================================================================== --- head/sys/powerpc/aim/mmu_oea.c Thu Nov 17 15:46:37 2011 (r227626) +++ head/sys/powerpc/aim/mmu_oea.c Thu Nov 17 15:48:12 2011 (r227627) @@ -1624,6 +1624,8 @@ moea_pinit(mmu_t mmu, pmap_t pmap) hash &= 0xfffff & ~(VSID_NBPW - 1); hash |= i; } + KASSERT(!(moea_vsid_bitmap[n] & mask), + ("Allocating in-use VSID group %#x\n", hash)); moea_vsid_bitmap[n] |= mask; for (i = 0; i < 16; i++) pmap->pm_sr[i] = VSID_MAKE(i, hash);