xmd_machdep.c is gone.diff -r1.71.4.4 -r1.71.4.5 src/sys/arch/powerpc/conf/files.powerpc
(uebayasi)
--- src/sys/arch/powerpc/conf/files.powerpc 2010/08/25 14:33:07 1.71.4.4
+++ src/sys/arch/powerpc/conf/files.powerpc 2010/10/30 08:43:12 1.71.4.5
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: files.powerpc,v 1.71.4.4 2010/08/25 14:33:07 uebayasi Exp $ | 1 | # $NetBSD: files.powerpc,v 1.71.4.5 2010/10/30 08:43:12 uebayasi Exp $ | |
2 | 2 | |||
3 | defflag opt_altivec.h ALTIVEC K_ALTIVEC | 3 | defflag opt_altivec.h ALTIVEC K_ALTIVEC | |
4 | defflag opt_openpic.h OPENPIC OPENPIC_SERIAL_MODE | 4 | defflag opt_openpic.h OPENPIC OPENPIC_SERIAL_MODE | |
5 | defparam opt_ppcparam.h L2CR_CONFIG L3CR_CONFIG INTSTK CLOCKBASE | 5 | defparam opt_ppcparam.h L2CR_CONFIG L3CR_CONFIG INTSTK CLOCKBASE | |
6 | defflag opt_ppcarch.h PPC_OEA PPC_OEA601 PPC_OEA64 PPC_OEA64_BRIDGE PPC_MPC8XX PPC_IBM4XX PPC_IBM403 PPC_BOOKE | 6 | defflag opt_ppcarch.h PPC_OEA PPC_OEA601 PPC_OEA64 PPC_OEA64_BRIDGE PPC_MPC8XX PPC_IBM4XX PPC_IBM403 PPC_BOOKE | |
7 | __BUS_SPACE_HAS_PHYSLOAD_METHODS | 7 | __BUS_SPACE_HAS_PHYSLOAD_METHODS | |
8 | defflag opt_pmap.h PMAPDEBUG PMAPCHECK PMAPCOUNTERS | 8 | defflag opt_pmap.h PMAPDEBUG PMAPCHECK PMAPCOUNTERS | |
9 | defparam opt_pmap.h PTEGCOUNT PMAP_MEMLIMIT | 9 | defparam opt_pmap.h PTEGCOUNT PMAP_MEMLIMIT | |
10 | 10 | |||
11 | file arch/powerpc/powerpc/copystr.c | 11 | file arch/powerpc/powerpc/copystr.c | |
12 | file arch/powerpc/powerpc/core_machdep.c coredump | 12 | file arch/powerpc/powerpc/core_machdep.c coredump | |
13 | file arch/powerpc/powerpc/fubyte.c | 13 | file arch/powerpc/powerpc/fubyte.c | |
14 | file arch/powerpc/powerpc/fuswintr.c | 14 | file arch/powerpc/powerpc/fuswintr.c | |
@@ -84,15 +84,13 @@ file arch/powerpc/powerpc/darwin_commpag | @@ -84,15 +84,13 @@ file arch/powerpc/powerpc/darwin_commpag | |||
84 | 84 | |||
85 | include "compat/netbsd32/files.netbsd32" | 85 | include "compat/netbsd32/files.netbsd32" | |
86 | file arch/powerpc/powerpc/netbsd32_sigcode.S compat_netbsd32 | 86 | file arch/powerpc/powerpc/netbsd32_sigcode.S compat_netbsd32 | |
87 | 87 | |||
88 | # OSS audio driver compatibility | 88 | # OSS audio driver compatibility | |
89 | include "compat/ossaudio/files.ossaudio" | 89 | include "compat/ossaudio/files.ossaudio" | |
90 | 90 | |||
91 | # Linux binary compatibility (COMPAT_LINUX) | 91 | # Linux binary compatibility (COMPAT_LINUX) | |
92 | include "compat/linux/files.linux" | 92 | include "compat/linux/files.linux" | |
93 | include "compat/linux/arch/powerpc/files.linux_powerpc" | 93 | include "compat/linux/arch/powerpc/files.linux_powerpc" | |
94 | file arch/powerpc/powerpc/linux_sigcode.S compat_linux | 94 | file arch/powerpc/powerpc/linux_sigcode.S compat_linux | |
95 | file arch/powerpc/powerpc/linux_trap.c compat_linux | 95 | file arch/powerpc/powerpc/linux_trap.c compat_linux | |
96 | file arch/powerpc/powerpc/linux_syscall.c compat_linux | 96 | file arch/powerpc/powerpc/linux_syscall.c compat_linux | |
97 | ||||
98 | file arch/powerpc/powerpc/xmd_machdep.c xmd |
--- src/sys/arch/x86/conf/files.x86 2010/08/20 07:04:37 1.54.2.2
+++ src/sys/arch/x86/conf/files.x86 2010/10/30 08:43:12 1.54.2.3
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: files.x86,v 1.54.2.2 2010/08/20 07:04:37 uebayasi Exp $ | 1 | # $NetBSD: files.x86,v 1.54.2.3 2010/10/30 08:43:12 uebayasi Exp $ | |
2 | 2 | |||
3 | # options for MP configuration through the MP spec | 3 | # options for MP configuration through the MP spec | |
4 | defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI | 4 | defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI | |
5 | 5 | |||
6 | # MTRR support | 6 | # MTRR support | |
7 | defflag MTRR | 7 | defflag MTRR | |
8 | 8 | |||
9 | # Interrupt debug | 9 | # Interrupt debug | |
10 | defflag opt_intrdebug.h INTRDEBUG | 10 | defflag opt_intrdebug.h INTRDEBUG | |
11 | 11 | |||
12 | # PCI fixup options | 12 | # PCI fixup options | |
13 | defflag opt_pcifixup.h PCI_ADDR_FIXUP PCI_BUS_FIXUP | 13 | defflag opt_pcifixup.h PCI_ADDR_FIXUP PCI_BUS_FIXUP | |
14 | PCI_INTR_FIXUP PCI_INTR_FIXUP_FORCE | 14 | PCI_INTR_FIXUP PCI_INTR_FIXUP_FORCE | |
@@ -111,22 +111,20 @@ file arch/x86/x86/coretemp.c intel_core | @@ -111,22 +111,20 @@ file arch/x86/x86/coretemp.c intel_core | |||
111 | 111 | |||
112 | # VIA C7 Temperature sensor | 112 | # VIA C7 Temperature sensor | |
113 | file arch/x86/x86/viac7temp.c via_c7temp | 113 | file arch/x86/x86/viac7temp.c via_c7temp | |
114 | 114 | |||
115 | # IPMI device | 115 | # IPMI device | |
116 | device ipmi: sysmon_envsys, sysmon_wdog | 116 | device ipmi: sysmon_envsys, sysmon_wdog | |
117 | attach ipmi at ipmibus | 117 | attach ipmi at ipmibus | |
118 | file arch/x86/x86/ipmi.c ipmi needs-flag | 118 | file arch/x86/x86/ipmi.c ipmi needs-flag | |
119 | 119 | |||
120 | file arch/x86/x86/vga_post.c vga_post | 120 | file arch/x86/x86/vga_post.c vga_post | |
121 | 121 | |||
122 | file arch/x86/x86/tprof_pmi.c tprof needs-flag | 122 | file arch/x86/x86/tprof_pmi.c tprof needs-flag | |
123 | 123 | |||
124 | file arch/x86/x86/xmd_machdep.c xmd | |||
125 | ||||
126 | file arch/x86/pci/pci_machdep.c pci | 124 | file arch/x86/pci/pci_machdep.c pci | |
127 | file arch/x86/pci/pci_intr_machdep.c pci | 125 | file arch/x86/pci/pci_intr_machdep.c pci | |
128 | 126 | |||
129 | file arch/x86/pci/pciide_machdep.c pciide_common | 127 | file arch/x86/pci/pciide_machdep.c pciide_common | |
130 | 128 | |||
131 | file arch/x86/pci/pci_bus_fixup.c pci_bus_fixup | 129 | file arch/x86/pci/pci_bus_fixup.c pci_bus_fixup | |
132 | file arch/x86/pci/pci_addr_fixup.c pci_addr_fixup | 130 | file arch/x86/pci/pci_addr_fixup.c pci_addr_fixup |