From owner-svn-src-all@FreeBSD.ORG Wed Jun 9 14:21:43 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 7E5F41065670; Wed, 9 Jun 2010 14:21:43 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 325E68FC1F; Wed, 9 Jun 2010 14:21:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id o59EFNAr022514; Wed, 9 Jun 2010 08:15:23 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Wed, 09 Jun 2010 08:15:24 -0600 (MDT) Message-Id: <20100609.081524.287595822797354295.imp@bsdimp.com> To: jhb@freebsd.org From: "M. Warner Losh" In-Reply-To: <201006090803.21947.jhb@freebsd.org> References: <201006081725.24684.jhb@freebsd.org> <20100608.163930.769051484062774012.imp@bsdimp.com> <201006090803.21947.jhb@freebsd.org> X-Mailer: Mew version 6.3 on Emacs 22.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit 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 14:21:43 -0000 In message: <201006090803.21947.jhb@freebsd.org> John Baldwin writes: : 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. :) Yes. You've surmised how this is going to work. : > : 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. cool. Warner