From owner-freebsd-stable@FreeBSD.ORG Sun Dec 20 00:42:40 2009 Return-Path: Delivered-To: stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 982DB1065670 for ; Sun, 20 Dec 2009 00:42:40 +0000 (UTC) (envelope-from imb@protected-networks.net) Received: from sarah.protected-networks.net (sarah.protected-networks.net [IPv6:2001:470:1f07:4e1::1]) by mx1.freebsd.org (Postfix) with ESMTP id 5893A8FC13 for ; Sun, 20 Dec 2009 00:42:40 +0000 (UTC) Received: from toshi.auburn.protected-networks.net (toshi.auburn.protected-networks.net [202.12.127.84]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "Iain Butler", Issuer "RSA Class 2 Personal CA" (verified OK)) (Authenticated sender: imb) by sarah.protected-networks.net (Postfix) with ESMTPSA id 350AA60E2; Sat, 19 Dec 2009 19:42:37 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=protected-networks.net; s=200705; t=1261269757; bh=iLKXWT2v2PvYiIdhjUw4Df1neqAHepClGuHzCff46uc=; h=Message-ID:Date:From:MIME-Version:To:Subject:References: In-Reply-To:Content-Type; b=bAs3UTIkV3a/eY9gYPGarimLUyK3tTcpHptsjlJfwqezHcqF2ut/TYMfgVHn5Nqv+ IelpOnWYTEMJSkuz5M3TCZ1hiwTDx2vMy/fRK05+d82eMtp2Z94Iqp6ntOKFj53 DomainKey-Signature: a=rsa-sha1; s=200509; d=protected-networks.net; c=nofws; q=dns; h=message-id:date:from:user-agent:mime-version:to:subject: references:in-reply-to:content-type; b=mDDu6MkZIZKNdMII6fMzR9rAtpBGfcxlEHed5/AQSL7PtLmRR67BBUhntqNzKbLvz 4EElz2eqh3uGFBTICshzTwC9pigTFVndfRqgktCQbaOpqgkWTKxHkU60UPNlpkS Message-ID: <4B2D72F4.4000404@protected-networks.net> Date: Sat, 19 Dec 2009 19:42:28 -0500 From: Michael Butler User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.5) Gecko/20091218 Thunderbird/3.0 MIME-Version: 1.0 To: David Wolfskill , stable@freebsd.org References: <20091219133511.GI470@bunrab.catwhisker.org> In-Reply-To: <20091219133511.GI470@bunrab.catwhisker.org> Content-Type: multipart/mixed; boundary="------------090402000303020006020107" Cc: Subject: Re: Failure during GENERIC (i386) kernel build at r200721 X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Dec 2009 00:42:40 -0000 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--