From owner-svn-src-head@FreeBSD.ORG  Mon Nov  1 18:18:47 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7ABF6106566B;
	Mon,  1 Nov 2010 18:18:47 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 65E938FC13;
	Mon,  1 Nov 2010 18:18:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oA1IIlaV079708;
	Mon, 1 Nov 2010 18:18:47 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA1IIkQt079688;
	Mon, 1 Nov 2010 18:18:46 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201011011818.oA1IIkQt079688@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 1 Nov 2010 18:18:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214631 - in head/sys: amd64/acpica amd64/amd64
	amd64/include i386/acpica i386/i386 i386/include i386/xen
	pc98/include x86/include x86/x86
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Nov 2010 18:18:47 -0000

Author: jhb
Date: Mon Nov  1 18:18:46 2010
New Revision: 214631
URL: http://svn.freebsd.org/changeset/base/214631

Log:
  Move <machine/apicreg.h> to <x86/apicreg.h>.

Added:
  head/sys/x86/include/apicreg.h
     - copied, changed from r214624, head/sys/i386/include/apicreg.h
Deleted:
  head/sys/amd64/include/apicreg.h
  head/sys/i386/include/apicreg.h
  head/sys/pc98/include/apicreg.h
Modified:
  head/sys/amd64/acpica/acpi_wakeup.c
  head/sys/amd64/acpica/madt.c
  head/sys/amd64/amd64/apic_vector.S
  head/sys/amd64/amd64/genassym.c
  head/sys/amd64/amd64/mp_machdep.c
  head/sys/amd64/amd64/mp_watchdog.c
  head/sys/i386/acpica/madt.c
  head/sys/i386/i386/apic_vector.s
  head/sys/i386/i386/genassym.c
  head/sys/i386/i386/mp_machdep.c
  head/sys/i386/i386/mp_watchdog.c
  head/sys/i386/i386/mpboot.s
  head/sys/i386/xen/mp_machdep.c
  head/sys/i386/xen/mptable.c
  head/sys/x86/x86/io_apic.c
  head/sys/x86/x86/local_apic.c
  head/sys/x86/x86/mptable.c
  head/sys/x86/x86/msi.c

Modified: head/sys/amd64/acpica/acpi_wakeup.c
==============================================================================
--- head/sys/amd64/acpica/acpi_wakeup.c	Mon Nov  1 17:40:35 2010	(r214630)
+++ head/sys/amd64/acpica/acpi_wakeup.c	Mon Nov  1 18:18:46 2010	(r214631)
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/specialreg.h>
 
 #ifdef SMP
-#include <machine/apicreg.h>
+#include <x86/apicreg.h>
 #include <machine/smp.h>
 #include <machine/vmparam.h>
 #endif

Modified: head/sys/amd64/acpica/madt.c
==============================================================================
--- head/sys/amd64/acpica/madt.c	Mon Nov  1 17:40:35 2010	(r214630)
+++ head/sys/amd64/acpica/madt.c	Mon Nov  1 18:18:46 2010	(r214631)
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <machine/apicreg.h>
+#include <x86/apicreg.h>
 #include <machine/intr_machdep.h>
 #include <machine/apicvar.h>
 

Modified: head/sys/amd64/amd64/apic_vector.S
==============================================================================
--- head/sys/amd64/amd64/apic_vector.S	Mon Nov  1 17:40:35 2010	(r214630)
+++ head/sys/amd64/amd64/apic_vector.S	Mon Nov  1 18:18:46 2010	(r214631)
@@ -39,7 +39,7 @@
 #include "opt_smp.h"
 
 #include <machine/asmacros.h>
-#include <machine/apicreg.h>
+#include <x86/apicreg.h>
 
 #include "assym.s"
 

Modified: head/sys/amd64/amd64/genassym.c
==============================================================================
--- head/sys/amd64/amd64/genassym.c	Mon Nov  1 17:40:35 2010	(r214630)
+++ head/sys/amd64/amd64/genassym.c	Mon Nov  1 18:18:46 2010	(r214631)
@@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$");
 #include <nfs/nfsproto.h>
 #include <nfsclient/nfs.h>
 #include <nfsclient/nfsdiskless.h>
-#include <machine/apicreg.h>
+#include <x86/apicreg.h>
 #include <machine/cpu.h>
 #include <machine/pcb.h>
 #include <machine/sigframe.h>

Modified: head/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- head/sys/amd64/amd64/mp_machdep.c	Mon Nov  1 17:40:35 2010	(r214630)
+++ head/sys/amd64/amd64/mp_machdep.c	Mon Nov  1 18:18:46 2010	(r214631)
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
 
-#include <machine/apicreg.h>
+#include <x86/apicreg.h>
 #include <machine/clock.h>
 #include <machine/cputypes.h>
 #include <machine/cpufunc.h>

Modified: head/sys/amd64/amd64/mp_watchdog.c
==============================================================================
--- head/sys/amd64/amd64/mp_watchdog.c	Mon Nov  1 17:40:35 2010	(r214630)
+++ head/sys/amd64/amd64/mp_watchdog.c	Mon Nov  1 18:18:46 2010	(r214631)
@@ -44,7 +44,7 @@
 #include <sys/systm.h>
 
 #include <machine/smp.h>
-#include <machine/apicreg.h>
+#include <x86/apicreg.h>
 #include <machine/apicvar.h>
 #include <machine/mp_watchdog.h>
 

Modified: head/sys/i386/acpica/madt.c
==============================================================================
--- head/sys/i386/acpica/madt.c	Mon Nov  1 17:40:35 2010	(r214630)
+++ head/sys/i386/acpica/madt.c	Mon Nov  1 18:18:46 2010	(r214631)
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <machine/apicreg.h>
+#include <x86/apicreg.h>
 #include <machine/intr_machdep.h>
 #include <machine/apicvar.h>
 

Modified: head/sys/i386/i386/apic_vector.s
==============================================================================
--- head/sys/i386/i386/apic_vector.s	Mon Nov  1 17:40:35 2010	(r214630)
+++ head/sys/i386/i386/apic_vector.s	Mon Nov  1 18:18:46 2010	(r214631)
@@ -39,7 +39,7 @@
 #include "opt_smp.h"
 
 #include <machine/asmacros.h>
-#include <machine/apicreg.h>
+#include <x86/apicreg.h>
 
 #include "assym.s"
 

Modified: head/sys/i386/i386/genassym.c
==============================================================================
--- head/sys/i386/i386/genassym.c	Mon Nov  1 17:40:35 2010	(r214630)
+++ head/sys/i386/i386/genassym.c	Mon Nov  1 18:18:46 2010	(r214631)
@@ -70,7 +70,7 @@ __FBSDID("$FreeBSD$");
 #include <nfsclient/nfs.h>
 #include <nfsclient/nfsdiskless.h>
 #ifdef DEV_APIC
-#include <machine/apicreg.h>
+#include <x86/apicreg.h>
 #endif
 #include <machine/cpu.h>
 #include <machine/pcb.h>

Modified: head/sys/i386/i386/mp_machdep.c
==============================================================================
--- head/sys/i386/i386/mp_machdep.c	Mon Nov  1 17:40:35 2010	(r214630)
+++ head/sys/i386/i386/mp_machdep.c	Mon Nov  1 18:18:46 2010	(r214631)
@@ -72,7 +72,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
 
-#include <machine/apicreg.h>
+#include <x86/apicreg.h>
 #include <machine/clock.h>
 #include <machine/cputypes.h>
 #include <x86/mca.h>

Modified: head/sys/i386/i386/mp_watchdog.c
==============================================================================
--- head/sys/i386/i386/mp_watchdog.c	Mon Nov  1 17:40:35 2010	(r214630)
+++ head/sys/i386/i386/mp_watchdog.c	Mon Nov  1 18:18:46 2010	(r214631)
@@ -44,7 +44,7 @@
 #include <sys/systm.h>
 
 #include <machine/smp.h>
-#include <machine/apicreg.h>
+#include <x86/apicreg.h>
 #include <machine/apicvar.h>
 #include <machine/mp_watchdog.h>
 

Modified: head/sys/i386/i386/mpboot.s
==============================================================================
--- head/sys/i386/i386/mpboot.s	Mon Nov  1 17:40:35 2010	(r214630)
+++ head/sys/i386/i386/mpboot.s	Mon Nov  1 18:18:46 2010	(r214631)
@@ -32,7 +32,7 @@
 #include "opt_pmap.h"
 
 #include <machine/asmacros.h>		/* miscellaneous asm macros */
-#include <machine/apicreg.h>
+#include <x86/apicreg.h>
 #include <machine/specialreg.h>
 
 #include "assym.s"

Modified: head/sys/i386/xen/mp_machdep.c
==============================================================================
--- head/sys/i386/xen/mp_machdep.c	Mon Nov  1 17:40:35 2010	(r214630)
+++ head/sys/i386/xen/mp_machdep.c	Mon Nov  1 18:18:46 2010	(r214631)
@@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_extern.h>
 #include <vm/vm_page.h>
 
-#include <machine/apicreg.h>
+#include <x86/apicreg.h>
 #include <machine/md_var.h>
 #include <machine/mp_watchdog.h>
 #include <machine/pcb.h>

Modified: head/sys/i386/xen/mptable.c
==============================================================================
--- head/sys/i386/xen/mptable.c	Mon Nov  1 17:40:35 2010	(r214630)
+++ head/sys/i386/xen/mptable.c	Mon Nov  1 18:18:46 2010	(r214631)
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 
-#include <machine/apicreg.h>
+#include <x86/apicreg.h>
 #include <machine/frame.h>
 #include <machine/intr_machdep.h>
 #include <machine/apicvar.h>

Copied and modified: head/sys/x86/include/apicreg.h (from r214624, head/sys/i386/include/apicreg.h)
==============================================================================
--- head/sys/i386/include/apicreg.h	Mon Nov  1 11:38:04 2010	(r214624, copy source)
+++ head/sys/x86/include/apicreg.h	Mon Nov  1 18:18:46 2010	(r214631)
@@ -25,8 +25,8 @@
  * $FreeBSD$
  */
 
-#ifndef _MACHINE_APICREG_H_
-#define _MACHINE_APICREG_H_
+#ifndef _X86_APICREG_H_
+#define _X86_APICREG_H_
 
 /*
  * Local && I/O APIC definitions.
@@ -442,4 +442,4 @@ typedef struct IOAPIC ioapic_t;
 
 #define IOART_INTVEC	0x000000ff	/* R/W: INTerrupt vector field */
 
-#endif /* _MACHINE_APICREG_H_ */
+#endif /* _X86_APICREG_H_ */

Modified: head/sys/x86/x86/io_apic.c
==============================================================================
--- head/sys/x86/x86/io_apic.c	Mon Nov  1 17:40:35 2010	(r214630)
+++ head/sys/x86/x86/io_apic.c	Mon Nov  1 18:18:46 2010	(r214631)
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <machine/apicreg.h>
+#include <x86/apicreg.h>
 #include <machine/frame.h>
 #include <machine/intr_machdep.h>
 #include <machine/apicvar.h>

Modified: head/sys/x86/x86/local_apic.c
==============================================================================
--- head/sys/x86/x86/local_apic.c	Mon Nov  1 17:40:35 2010	(r214630)
+++ head/sys/x86/x86/local_apic.c	Mon Nov  1 18:18:46 2010	(r214631)
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <machine/apicreg.h>
+#include <x86/apicreg.h>
 #include <machine/cpu.h>
 #include <machine/cputypes.h>
 #include <machine/frame.h>

Modified: head/sys/x86/x86/mptable.c
==============================================================================
--- head/sys/x86/x86/mptable.c	Mon Nov  1 17:40:35 2010	(r214630)
+++ head/sys/x86/x86/mptable.c	Mon Nov  1 18:18:46 2010	(r214631)
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 
-#include <machine/apicreg.h>
+#include <x86/apicreg.h>
 #include <machine/frame.h>
 #include <machine/intr_machdep.h>
 #include <machine/apicvar.h>

Modified: head/sys/x86/x86/msi.c
==============================================================================
--- head/sys/x86/x86/msi.c	Mon Nov  1 17:40:35 2010	(r214630)
+++ head/sys/x86/x86/msi.c	Mon Nov  1 18:18:46 2010	(r214631)
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/mutex.h>
 #include <sys/sx.h>
 #include <sys/systm.h>
-#include <machine/apicreg.h>
+#include <x86/apicreg.h>
 #include <machine/cputypes.h>
 #include <machine/md_var.h>
 #include <machine/frame.h>