Date: Sat, 19 Dec 2009 19:42:28 -0500 From: Michael Butler <imb@protected-networks.net> To: David Wolfskill <david@catwhisker.org>, stable@freebsd.org Subject: Re: Failure during GENERIC (i386) kernel build at r200721 Message-ID: <4B2D72F4.4000404@protected-networks.net> In-Reply-To: <20091219133511.GI470@bunrab.catwhisker.org> References: <20091219133511.GI470@bunrab.catwhisker.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------090402000303020006020107
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
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
--------------090402000303020006020107
Content-Type: text/x-diff;
name="mca-fix-svn200714.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="mca-fix-svn200714.diff"
*** 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);
}
--------------090402000303020006020107--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4B2D72F4.4000404>