Module Name: src
Committed By: uebayasi
Date: Fri Oct 10 09:13:22 UTC 2014
Modified Files:
src/sys/arch/amd64/conf: files.amd64
src/sys/arch/x86/conf: files.x86
src/sys/conf: files std
Log Message:
Define "machdep" attribute and mark files (in amd64 and x86).
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/amd64/conf/files.amd64
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/x86/conf/files.x86
cvs rdiff -u -r1.1108 -r1.1109 src/sys/conf/files
cvs rdiff -u -r1.16 -r1.17 src/sys/conf/std
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/files.amd64
diff -u src/sys/arch/amd64/conf/files.amd64:1.83 src/sys/arch/amd64/conf/files.amd64:1.84
--- src/sys/arch/amd64/conf/files.amd64:1.83 Thu Feb 20 03:48:06 2014
+++ src/sys/arch/amd64/conf/files.amd64 Fri Oct 10 09:13:21 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.amd64,v 1.83 2014/02/20 03:48:06 pgoyette Exp $
+# $NetBSD: files.amd64,v 1.84 2014/10/10 09:13:21 uebayasi Exp $
#
# new style config file for amd64 architecture
#
@@ -27,25 +27,25 @@ defparam opt_physmem.h PHYSMEM_MAX_ADDR
defflag USER_LDT
defflag eisa.h EISA
-file arch/amd64/amd64/amd64func.S
-file arch/amd64/amd64/autoconf.c
-file arch/amd64/amd64/busfunc.S
+file arch/amd64/amd64/amd64func.S machdep
+file arch/amd64/amd64/autoconf.c machdep
+file arch/amd64/amd64/busfunc.S machdep
file arch/amd64/amd64/cpu_in_cksum.S (inet | inet6) & cpu_in_cksum
-file arch/amd64/amd64/cpufunc.S
+file arch/amd64/amd64/cpufunc.S machdep
file arch/amd64/amd64/db_disasm.c ddb
file arch/amd64/amd64/db_interface.c ddb
file arch/amd64/amd64/db_machdep.c ddb
file arch/amd64/amd64/kobj_machdep.c modular
file arch/amd64/amd64/kgdb_machdep.c kgdb
file kern/subr_disk_mbr.c disk
-file arch/amd64/amd64/gdt.c
-file arch/amd64/amd64/machdep.c
-file arch/amd64/amd64/process_machdep.c
-file arch/amd64/amd64/trap.c
-file arch/x86/x86/fpu.c
-file arch/x86/x86/convert_xmm_s87.c
-file arch/amd64/amd64/lock_stubs.S
-file dev/cons.c
+file arch/amd64/amd64/gdt.c machdep
+file arch/amd64/amd64/machdep.c machdep
+file arch/amd64/amd64/process_machdep.c machdep
+file arch/amd64/amd64/trap.c machdep
+file arch/x86/x86/fpu.c machdep
+file arch/x86/x86/convert_xmm_s87.c machdep
+file arch/amd64/amd64/lock_stubs.S machdep
+file dev/cons.c machdep
file arch/amd64/amd64/mptramp.S multiprocessor
Index: src/sys/arch/x86/conf/files.x86
diff -u src/sys/arch/x86/conf/files.x86:1.81 src/sys/arch/x86/conf/files.x86:1.82
--- src/sys/arch/x86/conf/files.x86:1.81 Tue Mar 18 18:20:41 2014
+++ src/sys/arch/x86/conf/files.x86 Fri Oct 10 09:13:21 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.x86,v 1.81 2014/03/18 18:20:41 riastradh Exp $
+# $NetBSD: files.x86,v 1.82 2014/10/10 09:13:21 uebayasi Exp $
# options for MP configuration through the MP spec
defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI
@@ -66,34 +66,34 @@ attach vmt at cpufeaturebus
file arch/x86/x86/vmt.c vmt
file arch/x86/x86/apic.c ioapic | lapic
-file arch/x86/x86/bus_dma.c
-file arch/x86/x86/bus_space.c
-file arch/x86/x86/consinit.c
+file arch/x86/x86/bus_dma.c machdep
+file arch/x86/x86/bus_space.c machdep
+file arch/x86/x86/consinit.c machdep
file arch/x86/x86/core_machdep.c coredump
-file arch/x86/x86/cpu_topology.c
+file arch/x86/x86/cpu_topology.c machdep
file arch/x86/x86/db_memrw.c ddb | kgdb
file arch/x86/x86/db_trace.c ddb
-file arch/x86/x86/errata.c
-file arch/x86/x86/genfb_machdep.c
-file arch/x86/x86/identcpu.c
-file arch/x86/x86/i8259.c
-file arch/x86/x86/intr.c
-file arch/x86/x86/nmi.c
-file arch/x86/x86/idt.c
-file arch/x86/x86/ipi.c
+file arch/x86/x86/errata.c machdep
+file arch/x86/x86/genfb_machdep.c machdep
+file arch/x86/x86/identcpu.c machdep
+file arch/x86/x86/i8259.c machdep
+file arch/x86/x86/intr.c machdep
+file arch/x86/x86/nmi.c machdep
+file arch/x86/x86/idt.c machdep
+file arch/x86/x86/ipi.c machdep
file arch/x86/x86/mtrr_i686.c mtrr
-file arch/x86/x86/patch.c
-file arch/x86/x86/platform.c
-file arch/x86/x86/pmap.c
-file arch/x86/x86/pmap_tlb.c
+file arch/x86/x86/patch.c machdep
+file arch/x86/x86/platform.c machdep
+file arch/x86/x86/pmap.c machdep
+file arch/x86/x86/pmap_tlb.c machdep
file arch/x86/x86/procfs_machdep.c procfs
-file arch/x86/x86/sys_machdep.c
-file arch/x86/x86/syscall.c
-file arch/x86/x86/tsc.c
-file arch/x86/x86/vm_machdep.c
-file arch/x86/x86/x86_autoconf.c
-file arch/x86/x86/x86_userconf.c userconf
-file arch/x86/x86/x86_machdep.c
+file arch/x86/x86/sys_machdep.c machdep
+file arch/x86/x86/syscall.c machdep
+file arch/x86/x86/tsc.c machdep
+file arch/x86/x86/vm_machdep.c machdep
+file arch/x86/x86/x86_autoconf.c machdep
+file arch/x86/x86/x86_userconf.c userconf
+file arch/x86/x86/x86_machdep.c machdep
file arch/x86/x86/cpu_ucode.c cpu_ucode needs-flag
file arch/x86/x86/cpu_ucode_amd.c cpu_ucode needs-flag
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1108 src/sys/conf/files:1.1109
--- src/sys/conf/files:1.1108 Fri Oct 10 09:01:01 2014
+++ src/sys/conf/files Fri Oct 10 09:13:21 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1108 2014/10/10 09:01:01 uebayasi Exp $
+# $NetBSD: files,v 1.1109 2014/10/10 09:13:21 uebayasi Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20140824
@@ -153,6 +153,9 @@ defflag COMPAT_VAX1K
defflag COMPAT_43
defflag opt_compat_netbsd.h COMPAT_NOMID
+define machdep
+defflag opt_machdep.h MACHDEP
+
#
# Cryptography support. Include this early, since several things
# use it.
Index: src/sys/conf/std
diff -u src/sys/conf/std:1.16 src/sys/conf/std:1.17
--- src/sys/conf/std:1.16 Fri Oct 10 08:24:54 2014
+++ src/sys/conf/std Fri Oct 10 09:13:21 2014
@@ -1,10 +1,11 @@
-# $NetBSD: std,v 1.16 2014/10/10 08:24:54 uebayasi Exp $
+# $NetBSD: std,v 1.17 2014/10/10 09:13:21 uebayasi Exp $
#
# standard MI 'options'
#
# this file is for options which can't be off-by-default for some reasons.
# "it's commonly used" is NOT a good reason to enable options here.
+options MACHDEP
options UVM
options KERN
