On 12/19/09 08:35, David Wolfskill wrote:
Attempted clean kernel build, running
[ .. snip .. ]
/usr/src/sys/i386/i386/mca.c:510: warning: implicit declaration of function 'CPUID_TO_FAMILY' /usr/src/sys/i386/i386/mca.c:510: warning: nested extern declaration of 'CPUID_TO_FAMILY' /usr/src/sys/i386/i386/mca.c:511: warning: implicit declaration of function 'CPUID_TO_MODEL' /usr/src/sys/i386/i386/mca.c:511: warning: nested extern declaration of 'CPUID_TO_MODEL'
The attached patch fixes the RELENG_7 kernel build until svn 200714 gets revisited ..
imb
*** src/sys/i386/i386/mca.c~ Sat Dec 19 09:24:27 2009 --- src/sys/i386/i386/mca.c Sat Dec 19 19:30:55 2009 *************** *** 507,518 **** * For P6 models before Nehalem MC0_CTL is * always enabled and reserved. */ ! if (i == 0 && CPUID_TO_FAMILY(cpu_id) == 0x6 ! && CPUID_TO_MODEL(cpu_id) < 0x1a) skip = 1; } else if (cpu_vendor_id == CPU_VENDOR_AMD) { /* BKDG for Family 10h: unset GartTblWkEn. */ ! if (i == 4 && CPUID_TO_FAMILY(cpu_id) >= 0xf) ctl &= ~(1UL << 10); } --- 507,518 ---- * For P6 models before Nehalem MC0_CTL is * always enabled and reserved. */ ! if (i == 0 && I386_CPU_FAMILY(cpu_id) == 0x6 ! && I386_CPU_MODEL(cpu_id) < 0x1a) skip = 1; } else if (cpu_vendor_id == CPU_VENDOR_AMD) { /* BKDG for Family 10h: unset GartTblWkEn. */ ! if (i == 4 && I386_CPU_FAMILY(cpu_id) >= 0xf) ctl &= ~(1UL << 10); }
_______________________________________________ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"