summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2005-11-27 23:17:00 +0000
committerru <ru@FreeBSD.org>2005-11-27 23:17:00 +0000
commit9fa3a162bcf8544009ef55b3e84fb3e19396c953 (patch)
treea8f69b1f507a116aae9c4e4acdd1eb1f1271bb93 /sys/amd64
parent0b4ce8e3e1cb11709c2122272d006774ad389a59 (diff)
downloadFreeBSD-src-9fa3a162bcf8544009ef55b3e84fb3e19396c953.zip
FreeBSD-src-9fa3a162bcf8544009ef55b3e84fb3e19396c953.tar.gz
- Allow duplicate "machine" directives with the same arguments.
- Move existing "machine" directives to DEFAULTS.
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/conf/DEFAULTS3
-rw-r--r--sys/amd64/conf/GENERIC1
-rw-r--r--sys/amd64/conf/NOTES6
3 files changed, 1 insertions, 9 deletions
diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS
index 1464388..3321e97 100644
--- a/sys/amd64/conf/DEFAULTS
+++ b/sys/amd64/conf/DEFAULTS
@@ -3,8 +3,7 @@
#
# $FreeBSD$
-# Not yet, this would break all existing configs
-#machine amd64
+machine amd64
# Bus support.
device isa
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 7ba46da..af3c8a5 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -18,7 +18,6 @@
#
# $FreeBSD$
-machine amd64
cpu HAMMER
ident GENERIC
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 8f1566d..bfcd130 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -8,12 +8,6 @@
#
#
-# This directive is mandatory; it defines the architecture to be
-# configured for; in this case, the AMD64 family based machines.
-#
-machine amd64
-
-#
# We want LINT to cover profiling as well.
profile 2
OpenPOWER on IntegriCloud