atom feed6 messages in org.freebsd.freebsd-ppcRe: [head tinderbox] failure on power...
FromSent OnAttachments
Marius StroblDec 24, 2011 10:20 am 
Justin HibbitsDec 24, 2011 3:58 pm 
Dimitry AndricDec 24, 2011 4:30 pm 
Andreas ToblerDec 25, 2011 2:08 am 
Justin HibbitsDec 25, 2011 3:42 am 
Bjoern A. ZeebDec 25, 2011 6:30 am 
Subject:Re: [head tinderbox] failure on powerpc64/powerpc
From:Bjoern A. Zeeb (bz@FreeBSD.org)
Date:Dec 25, 2011 6:30:22 am
List:org.freebsd.freebsd-ppc

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