From owner-freebsd-current@FreeBSD.ORG Sun Dec 25 14:30:50 2011 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D35651065672; Sun, 25 Dec 2011 14:30:50 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:130:3ffc::401:25]) by mx1.freebsd.org (Postfix) with ESMTP id 5C6E98FC1D; Sun, 25 Dec 2011 14:30:50 +0000 (UTC) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 2CB0825D389E; Sun, 25 Dec 2011 14:30:48 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 1ACB6BD7C22; Sun, 25 Dec 2011 14:30:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id 8XiOYk7iSTXH; Sun, 25 Dec 2011 14:30:47 +0000 (UTC) Received: from orange-en1.sbone.de (orange-en1.sbone.de [IPv6:fde9:577b:c1a9:31:cabc:c8ff:fecf:e8e3]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id E8704BD7C21; Sun, 25 Dec 2011 14:30:46 +0000 (UTC) Mime-Version: 1.0 (Apple Message framework v1084) Content-Type: text/plain; charset=us-ascii From: "Bjoern A. Zeeb" In-Reply-To: Date: Sun, 25 Dec 2011 14:30:45 +0000 Content-Transfer-Encoding: 7bit Message-Id: <7139CFFA-1DEA-4739-B689-B7DB03B4B625@FreeBSD.org> References: <201112242345.pBONjh5K008411@freebsd-current.sentex.ca> <4EF6F633.80803@fgznet.ch> To: Justin Hibbits X-Mailer: Apple Mail (2.1084) Cc: powerpc64@freebsd.org, Andreas Tobler , FreeBSD Tinderbox , current@freebsd.org Subject: Re: [head tinderbox] failure on powerpc64/powerpc X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Dec 2011 14:30:50 -0000 On 25. Dec 2011, at 11:42 , Justin Hibbits wrote: >>> Sorry about this, bad patch when I tested the build. I'll fix it tomorrow >>> when I get time. >> >> >> Something like this? >> >> Andreas >> >> Index: hwpmc_powerpc.c >> =================================================================== >> --- hwpmc_powerpc.c (revision 228872) >> +++ hwpmc_powerpc.c (working copy) >> @@ -686,10 +686,10 @@ >> v = pm->pm_sc.pm_reloadcount; >> config = mfspr(SPR_MMCR0); >> >> - KASSERT((config & ~AMD_PMC_ENABLE) == >> - (pm->pm_md.pm_amd.pm_amd_evsel & ~AMD_PMC_ENABLE), >> + KASSERT((config & ~POWERPC_PMC_ENABLE) == >> + (pm->pm_md.pm_powerpc.pm_powerpc_evsel & > ~POWERPC_PMC_ENABLE), >> ("[powerpc,%d] config mismatch reg=0x%x pm=0x%x", > __LINE__, >> - config, pm->pm_md.pm_amd.pm_amd_evsel)); >> + config, pm->pm_md.pm_powerpc.pm_powerpc_evsel)); >> >> mtspr(SPR_MMCR0, config | SPR_MMCR0_FC); >> powerpc_pmcn_write(i, v); >> >> > > It's fine to delete the assert, I sent Nathan a patch to do so, but don't > expect to commit it until tonight or tomorrow. You could commit a deletion > if you want. I just did in r228874. Happy holidays, /bz -- Bjoern A. Zeeb You have to have visions! Stop bit received. Insert coin for new address family. -- Bjoern A. Zeeb You have to have visions! Stop bit received. Insert coin for new address family.