From owner-svn-src-all@FreeBSD.ORG Wed Jun 9 12:44:45 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0329D106564A; Wed, 9 Jun 2010 12:44:45 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id B248F8FC13; Wed, 9 Jun 2010 12:44:44 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 6493946B98; Wed, 9 Jun 2010 08:44:44 -0400 (EDT) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPA id 67B138A025; Wed, 9 Jun 2010 08:44:43 -0400 (EDT) From: John Baldwin To: "M. Warner Losh" Date: Wed, 9 Jun 2010 08:03:21 -0400 User-Agent: KMail/1.12.1 (FreeBSD/7.3-CBSD-20100217; KDE/4.3.1; amd64; ; ) References: <201006081446.09423.jhb@freebsd.org> <201006081725.24684.jhb@freebsd.org> <20100608.163930.769051484062774012.imp@bsdimp.com> In-Reply-To: <20100608.163930.769051484062774012.imp@bsdimp.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201006090803.21947.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Wed, 09 Jun 2010 08:44:43 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.5 required=4.2 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r208921 - in head/sys: amd64/amd64 conf i386/i386 x86/x86 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2010 12:44:45 -0000 On Tuesday 08 June 2010 6:39:30 pm M. Warner Losh wrote: > In message: <201006081725.24684.jhb@freebsd.org> > John Baldwin writes: > : On Tuesday 08 June 2010 3:22:10 pm M. Warner Losh wrote: > : > In message: <201006081446.09423.jhb@freebsd.org> > : > John Baldwin writes: > : > : On Tuesday 08 June 2010 2:04:07 pm John Baldwin wrote: > : > : > Author: jhb > : > : > Date: Tue Jun 8 18:04:07 2010 > : > : > New Revision: 208921 > : > : > URL: http://svn.freebsd.org/changeset/base/208921 > : > : > > : > : > Log: > : > : > Move the machine check support code to the x86 tree since it is > : identical > : > : > on i386 and amd64. > : > : > > : > : > Requested by: alc > : > : > : > : It would be nice to consolidate as that is identical on > : both > : > : platforms, but that moving to x86/include is trickier as the header needs > : to > : > : be available in userland, probably as still. > : > : would work ok (i.e. in /usr/include/x86/mca.h), but that makes things > : trickier > : > : in the kernel as the file should really live in sys/x86/include, not > : sys/x86 > : > : directly. > : > : > : > : I'm open to suggestions on if this is feasible and if so how to do it. > : > > : > I believe we had a long talk about this before. > : > > : > copy the current {i386,amd64}/mca.h to x86/mca.h > : > new {i386,amd64}/mca.h == #include (no copyright notice, etc) > : > > : > just like we do for the pc98 stuff. The mca.h file would live in > : > sys/x86/include. > : > : How does this work for the kernel? doesn't map to > : sys/x86/include/mca.h. > > You still include macine/mca.h inside the kernel, except for mca.c > itself. You shouldn't short-circuit things because you know an > implementation detail. I was asking how the actual contents would work since it would #include which only works if you have some sort of x86 symlink. :) > : For machine we make a symlink that points to > : sys//include. Are you proposing an x86 symlink in the kernel build > : directory that for i386, pc98, and amd64 that points to sys/x86/include? > > Yes. > > : Ah, looks like you are. This is handled by _ILINKS in kern.post.mk currently. > : If you will fix all the glue magic so #include works in kernel and > : userland I have several headers I can move (apicreg.h, mca.h, etc.). > > I believe this is correct... > > But a lot of it is dependent on the merge of tbemd branch, which is > still at least a week away. Can you wait that long? Yes, I can wait for quite a while. -- John Baldwin