[src/trunk]: src/sys/arch/sparc64/conf Backout previous, PR 54810 has been fi...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cd4bb6699e85
branches:  trunk
changeset: 1015584:cd4bb6699e85
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Oct 26 11:49:45 2020 +0000

description:
Backout previous, PR 54810 has been fixed.

diffstat:

 sys/arch/sparc64/conf/GENERIC |  7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diffs (25 lines):

diff -r 4ecce23020b6 -r cd4bb6699e85 sys/arch/sparc64/conf/GENERIC
--- a/sys/arch/sparc64/conf/GENERIC     Mon Oct 26 11:39:48 2020 +0000
+++ b/sys/arch/sparc64/conf/GENERIC     Mon Oct 26 11:49:45 2020 +0000
@@ -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 @@
 
 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_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