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.
_______________________________________________
freebsd-current@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
