Module Name: src
Committed By: pgoyette
Date: Sat Jan 27 21:46:54 UTC 2018
Modified Files:
src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0
Log Message:
Update amdzentemp(4) attachment info. Also for ALL, remove duplicate
entry for amdtemp(4).
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.483 -r1.484 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.146 -r1.147 src/sys/arch/amd64/conf/XEN3_DOM0
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/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.79 src/sys/arch/amd64/conf/ALL:1.80
--- src/sys/arch/amd64/conf/ALL:1.79 Thu Jan 25 01:21:40 2018
+++ src/sys/arch/amd64/conf/ALL Sat Jan 27 21:46:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.79 2018/01/25 01:21:40 christos Exp $
+# $NetBSD: ALL,v 1.80 2018/01/27 21:46:54 pgoyette Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.79 $"
+#ident "ALL-$Revision: 1.80 $"
maxusers 64 # estimated number of users
@@ -423,13 +423,6 @@ options PCIBIOS_SHARP_MM20_FIXUP # this
# on anything else.
#options PCIINTR_DEBUG # super-verbose PCI interrupt fixup
-# Temperatures
-amdnb_misc* at pci? # AMD NB Misc Configuration
-amdtemp* at amdnb_misc? # AMD CPU Temperature sensors
-
-amdsmn* at pci? # AMD SMN Configuration
-amdzentemp* at amdsmn? # AMD Ryzen Family 17h CPU temp sensors
-
# PCI bridges
rdcpcib* at pci? dev ? function ? # RDC Vortex86/PMX-1000 PCI-ISA w/
pchb* at pci? dev ? function ? # PCI-Host bridges
@@ -589,6 +582,10 @@ lpt2 at isa? port 0x3bc
# Hardware monitors
+# Temperatures
+amdsmn* at pci? # AMD SMN Configuration
+amdzentemp* at amdsmnbus? # AMD Ryzen Family 17h CPU temp sensors
+
amdnb_misc* at pci? # AMD NB Misc Configuration
amdtemp* at amdnb_misc? # AMD CPU Temperature sensors
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.483 src/sys/arch/amd64/conf/GENERIC:1.484
--- src/sys/arch/amd64/conf/GENERIC:1.483 Fri Jan 26 14:41:22 2018
+++ src/sys/arch/amd64/conf/GENERIC Sat Jan 27 21:46:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.483 2018/01/26 14:41:22 maxv Exp $
+# $NetBSD: GENERIC,v 1.484 2018/01/27 21:46:54 pgoyette Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.483 $"
+#ident "GENERIC-$Revision: 1.484 $"
maxusers 64 # estimated number of users
@@ -476,7 +476,7 @@ amdnb_misc* at pci? # AMD NB Misc Conf
amdtemp* at amdnb_misc? # AMD CPU Temperature sensors
amdsmn* at pci? # AMD SMN Configuration
-amdzentemp* at amdsmn? # AMD Ryzen Family 17h CPU temp sensors
+amdzentemp* at amdsmnbus? # AMD Ryzen Family 17h CPU temp sensors
# Winbond LPC Super I/O
#wbsio* at isa? port 0x2e
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.146 src/sys/arch/amd64/conf/XEN3_DOM0:1.147
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.146 Thu Jan 25 01:21:40 2018
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Jan 27 21:46:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.146 2018/01/25 01:21:40 christos Exp $
+# $NetBSD: XEN3_DOM0,v 1.147 2018/01/27 21:46:54 pgoyette Exp $
include "arch/amd64/conf/std.xen"
@@ -10,7 +10,7 @@ options INCLUDE_CONFIG_FILE # embed con
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
-#ident "XEN3_DOM0-$Revision: 1.146 $"
+#ident "XEN3_DOM0-$Revision: 1.147 $"
maxusers 32 # estimated number of users
@@ -299,7 +299,7 @@ amdnb_misc* at pci? # AMD NB Misc Conf
amdtemp* at amdnb_misc? # AMD CPU Temperature sensors
amdsmn* at pci? # AMD SMN Configuration
-amdzentemp* at amdsmn? # AMD Ryzen Family 17h CPU temp sensors
+amdzentemp* at amdsmnbus? # AMD Ryzen Family 17h CPU temp sensors
# AMD 768 and 8111 power/ACPI controllers
amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface
