Module Name: src
Committed By: martin
Date: Mon Oct 26 11:49:45 UTC 2020
Modified Files:
src/sys/arch/sparc64/conf: GENERIC
Log Message:
Backout previous, PR 54810 has been fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.231 -r1.232 src/sys/arch/sparc64/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/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.231 src/sys/arch/sparc64/conf/GENERIC:1.232
--- src/sys/arch/sparc64/conf/GENERIC:1.231 Sun Oct 25 18:53:11 2020
+++ src/sys/arch/sparc64/conf/GENERIC Mon Oct 26 11:49:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.231 2020/10/25 18:53:11 martin Exp $
+# $NetBSD: GENERIC,v 1.232 2020/10/26 11:49:45 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.231 $"
+#ident "GENERIC-$Revision: 1.232 $"
maxusers 64
@@ -861,6 +861,3 @@ options PAX_SEGVGUARD=0 # PaX Segmenta
# options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
# options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
options PAX_ASLR=1 # PaX Address Space Layout Randomization
-
-# Temporary workaround while analyzing memory corruption when booting from CD
-no file-system NTFS
