[Midnightbsd-cvs] src: i386/conf: Add cpufreq(4) and GEOM_LABEL aka GLABEL to GENERIC on

[laffer1 at midnightbsd.org]

Log Message:
-----------
Add cpufreq(4) and GEOM_LABEL aka GLABEL to GENERIC on i386 and amd64.

cpufreq works with powerd which is already enabled on systems without ACPI support for CPU frequency using several chipsets (intel).  This may cause problems for some people which might require an install option for powerd.  This needs testing.

glabel allows one to name disks and reference them in dev by that name instead of their normal designation like acd0 or ad0s2d.  By adding this to generic, we can easily make a live cd that works on more types of CDROMs.  FreeBSD is also moving in this direction for other reasons.

Until the latter can be tested on sparc64, I'll keep it out of generic.  We don't support sun style labels right now anyway.

Modified Files:
--------------
    src/sys/amd64/conf:
        GENERIC (r1.4 -> r1.5)
    src/sys/i386/conf:
        GENERIC (r1.10 -> r1.11)

-------------- next part --------------
Index: GENERIC
===================================================================
RCS file: /home/cvs/src/sys/amd64/conf/GENERIC,v
retrieving revision 1.4
retrieving revision 1.5
diff -L sys/amd64/conf/GENERIC -L sys/amd64/conf/GENERIC -u -r1.4 -r1.5
--- sys/amd64/conf/GENERIC
+++ sys/amd64/conf/GENERIC
@@ -42,6 +42,7 @@
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
 options 	GEOM_GPT		# GUID Partition Tables.
+options	GEOM_LABEL		# Support for labels with ISO, UFS
 options 	COMPAT_43		# Needed by COMPAT_LINUX32
 options 	COMPAT_IA32		# Compatible with i386 binaries
 options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
@@ -68,6 +69,9 @@
 # Linux 32-bit ABI support
 options 	LINPROCFS		# Cannot be a module yet.
 
+# CPU frequency control
+device		cpufreq
+
 # Bus support.
 device		acpi
 device		pci
Index: GENERIC
===================================================================
RCS file: /home/cvs/src/sys/i386/conf/GENERIC,v
retrieving revision 1.10
retrieving revision 1.11
diff -L sys/i386/conf/GENERIC -L sys/i386/conf/GENERIC -u -r1.10 -r1.11
--- sys/i386/conf/GENERIC
+++ sys/i386/conf/GENERIC
@@ -46,6 +46,7 @@
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
 options 	GEOM_GPT		# GUID Partition Tables.
+options	GEOM_LABEL		# Support for labels with ISO, UFS
 options 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
 options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
 options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
@@ -66,6 +67,9 @@
 
 device		apic			# I/O APIC
 
+# CPU frequency control
+device		cpufreq
+
 # Bus support.
 device		eisa
 device		pci