Module Name: src
Committed By: jakllsch
Date: Thu Sep 9 13:08:07 UTC 2021
Modified Files:
src/sys/arch/alpha/conf: GENERIC
Log Message:
Add optional GENERIC.local include in alpha's GENERIC.
To generate a diff of this commit:
cvs rdiff -u -r1.413 -r1.414 src/sys/arch/alpha/conf/GENERIC
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/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.413 src/sys/arch/alpha/conf/GENERIC:1.414
--- src/sys/arch/alpha/conf/GENERIC:1.413 Fri Jul 23 14:38:58 2021
+++ src/sys/arch/alpha/conf/GENERIC Thu Sep 9 13:08:07 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.413 2021/07/23 14:38:58 thorpej Exp $
+# $NetBSD: GENERIC,v 1.414 2021/09/09 13:08:07 jakllsch Exp $
#
# This machine description file is used to generate the default NetBSD
# kernel.
@@ -19,7 +19,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.413 $"
+ident "GENERIC-$Revision: 1.414 $"
maxusers 32
@@ -737,3 +737,6 @@ include "dev/veriexec.config"
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
options PAX_ASLR=0 # PaX Address Space Layout Randomization
+
+# Pull in optional local configuration
+cinclude "arch/alpha/conf/GENERIC.local"
