Module Name: src
Committed By: maya
Date: Tue Jul 10 19:58:13 UTC 2018
Modified Files:
src/sys/arch/amd64/conf: ALL
src/sys/arch/i386/conf: ALL GENERIC
src/sys/dev/apm: files.apm
Log Message:
Remove unused macro.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.441 -r1.442 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1181 -r1.1182 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/apm/files.apm
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.91 src/sys/arch/amd64/conf/ALL:1.92
--- src/sys/arch/amd64/conf/ALL:1.91 Tue Jul 10 17:01:43 2018
+++ src/sys/arch/amd64/conf/ALL Tue Jul 10 19:58:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.91 2018/07/10 17:01:43 maya Exp $
+# $NetBSD: ALL,v 1.92 2018/07/10 19:58:13 maya 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.91 $"
+#ident "ALL-$Revision: 1.92 $"
maxusers 64 # estimated number of users
@@ -319,7 +319,6 @@ config netbsd root on ? type ?
#options APM_V10_ONLY # Use only the APM 1.0 calls
#options APM_NO_POWEROFF # Don't power off on halt(8)
#options APM_POWER_PRINT # Print stats on the console
-#options APM_DISABLE_INTERRUPTS=0 # Don't disable interrupts
# Basic Bus Support
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.441 src/sys/arch/i386/conf/ALL:1.442
--- src/sys/arch/i386/conf/ALL:1.441 Tue Jul 10 17:01:43 2018
+++ src/sys/arch/i386/conf/ALL Tue Jul 10 19:58:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.441 2018/07/10 17:01:43 maya Exp $
+# $NetBSD: ALL,v 1.442 2018/07/10 19:58:13 maya 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/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.441 $"
+#ident "ALL-$Revision: 1.442 $"
maxusers 64 # estimated number of users
@@ -319,7 +319,6 @@ p64h2apic* at pci? dev? function? # P64H
#options APM_V10_ONLY # Use only the APM 1.0 calls
#options APM_NO_POWEROFF # Don't power off on halt(8)
#options APM_POWER_PRINT # Print stats on the console
-#options APM_DISABLE_INTERRUPTS=0 # Don't disable interrupts
# Basic Bus Support
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1181 src/sys/arch/i386/conf/GENERIC:1.1182
--- src/sys/arch/i386/conf/GENERIC:1.1181 Tue Jul 10 17:01:43 2018
+++ src/sys/arch/i386/conf/GENERIC Tue Jul 10 19:58:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1181 2018/07/10 17:01:43 maya Exp $
+# $NetBSD: GENERIC,v 1.1182 2018/07/10 19:58:13 maya Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1181 $"
+#ident "GENERIC-$Revision: 1.1182 $"
maxusers 64 # estimated number of users
@@ -299,7 +299,6 @@ config netbsd root on ? type ?
#options APM_V10_ONLY # Use only the APM 1.0 calls
#options APM_NO_POWEROFF # Don't power off on halt(8)
#options APM_POWER_PRINT # Print stats on the console
-#options APM_DISABLE_INTERRUPTS=0 # Don't disable interrupts
# Basic Bus Support
Index: src/sys/dev/apm/files.apm
diff -u src/sys/dev/apm/files.apm:1.4 src/sys/dev/apm/files.apm:1.5
--- src/sys/dev/apm/files.apm:1.4 Sun Sep 30 21:36:20 2012
+++ src/sys/dev/apm/files.apm Tue Jul 10 19:58:13 2018
@@ -1,10 +1,10 @@
-# $NetBSD: files.apm,v 1.4 2012/09/30 21:36:20 dsl Exp $
+# $NetBSD: files.apm,v 1.5 2018/07/10 19:58:13 maya Exp $
#
# Common APM support files
#
defflag opt_apm.h APM_V10_ONLY APM_NO_V12 APMDEBUG
APM_POWER_PRINT
-defparam opt_apm.h APMDEBUG_VALUE APM_DISABLE_INTERRUPTS
+defparam opt_apm.h APMDEBUG_VALUE
device apm
file dev/apm/apm.c apm
