Author: jhb
Date: Fri Mar  9 20:43:29 2012
New Revision: 232747
URL: http://svn.freebsd.org/changeset/base/232747

Log:
  Move i386's intr_machdep.c to the x86 tree and share it with amd64.

Added:
  head/sys/x86/x86/intr_machdep.c
     - copied, changed from r232744, head/sys/i386/i386/intr_machdep.c
Deleted:
  head/sys/amd64/amd64/intr_machdep.c
  head/sys/i386/i386/intr_machdep.c
Modified:
  head/sys/conf/files.amd64
  head/sys/conf/files.i386
  head/sys/conf/files.pc98

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64   Fri Mar  9 20:41:42 2012        (r232746)
+++ head/sys/conf/files.amd64   Fri Mar  9 20:43:29 2012        (r232747)
@@ -112,7 +112,6 @@ amd64/amd64/gdb_machdep.c   optional        gdb
 amd64/amd64/identcpu.c         standard
 amd64/amd64/in_cksum.c         optional        inet | inet6
 amd64/amd64/initcpu.c          standard
-amd64/amd64/intr_machdep.c     standard
 amd64/amd64/io.c               optional        io
 amd64/amd64/legacy.c           standard
 amd64/amd64/locore.S           standard        no-obj
@@ -475,6 +474,7 @@ x86/pci/pci_bus.c           optional        pci
 x86/pci/qpi.c                  optional        pci
 x86/x86/busdma_machdep.c       standard
 x86/x86/dump_machdep.c         standard
+x86/x86/intr_machdep.c         standard
 x86/x86/io_apic.c              standard
 x86/x86/local_apic.c           standard
 x86/x86/mca.c                  standard

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386    Fri Mar  9 20:41:42 2012        (r232746)
+++ head/sys/conf/files.i386    Fri Mar  9 20:43:29 2012        (r232747)
@@ -405,7 +405,6 @@ i386/i386/i686_mem.c                optional mem
 i386/i386/identcpu.c           standard
 i386/i386/in_cksum.c           optional inet | inet6
 i386/i386/initcpu.c            standard
-i386/i386/intr_machdep.c       standard
 i386/i386/io.c                 optional io
 i386/i386/k6_mem.c             optional mem
 i386/i386/legacy.c             optional native
@@ -527,6 +526,7 @@ x86/pci/pci_bus.c           optional pci
 x86/pci/qpi.c                  optional pci
 x86/x86/busdma_machdep.c       standard
 x86/x86/dump_machdep.c         standard
+x86/x86/intr_machdep.c         standard
 x86/x86/io_apic.c              optional apic
 x86/x86/local_apic.c           optional apic
 x86/x86/mca.c                  standard

Modified: head/sys/conf/files.pc98
==============================================================================
--- head/sys/conf/files.pc98    Fri Mar  9 20:41:42 2012        (r232746)
+++ head/sys/conf/files.pc98    Fri Mar  9 20:43:29 2012        (r232747)
@@ -144,7 +144,6 @@ i386/i386/i686_mem.c                optional mem
 i386/i386/identcpu.c           standard
 i386/i386/in_cksum.c           optional inet | inet6
 i386/i386/initcpu.c            standard
-i386/i386/intr_machdep.c       standard
 i386/i386/io.c                 optional io
 i386/i386/k6_mem.c             optional mem
 i386/i386/legacy.c             standard
@@ -251,6 +250,7 @@ x86/isa/isa.c                       optional isa
 x86/pci/pci_bus.c              optional pci
 x86/x86/busdma_machdep.c       standard
 x86/x86/dump_machdep.c         standard
+x86/x86/intr_machdep.c         standard
 x86/x86/io_apic.c              optional apic
 x86/x86/local_apic.c           optional apic
 x86/x86/mca.c                  standard

Copied and modified: head/sys/x86/x86/intr_machdep.c (from r232744, 
head/sys/i386/i386/intr_machdep.c)
==============================================================================
--- head/sys/i386/i386/intr_machdep.c   Fri Mar  9 19:42:48 2012        
(r232744, copy source)
+++ head/sys/x86/x86/intr_machdep.c     Fri Mar  9 20:43:29 2012        
(r232747)
@@ -30,7 +30,7 @@
  */
 
 /*
- * Machine dependent interrupt code for i386.  For the i386, we have to
+ * Machine dependent interrupt code for x86.  For x86, we have to
  * deal with different PICs.  Thus, we use the passed in vector to lookup
  * an interrupt source associated with that vector.  The interrupt source
  * describes which PIC the source belongs to and includes methods to handle
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to