Module Name: src
Committed By: martin
Date: Fri Jun 4 10:46:11 UTC 2021
Modified Files:
src/sys/arch/m68k/conf: std.m68k
src/sys/arch/playstation2/conf: std.playstation2
src/sys/arch/sh3/conf: std.sh3
src/sys/arch/sparc/conf: std.sparc
src/sys/arch/vax/conf: std.vax
Log Message:
Sprinkle a few VMSWAP_DEFAULT_PLAINTEXT for architectures where we do not
have any spare cpu cycles to waste (encrypted swap still could be
enabled by the admin in /etc/sysctl.conf).
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/m68k/conf/std.m68k
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/playstation2/conf/std.playstation2
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sh3/conf/std.sh3
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sparc/conf/std.sparc
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/vax/conf/std.vax
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/m68k/conf/std.m68k
diff -u src/sys/arch/m68k/conf/std.m68k:1.1 src/sys/arch/m68k/conf/std.m68k:1.2
--- src/sys/arch/m68k/conf/std.m68k:1.1 Sun Sep 19 02:09:28 2010
+++ src/sys/arch/m68k/conf/std.m68k Fri Jun 4 10:46:11 2021
@@ -1,4 +1,4 @@
-# $NetBSD: std.m68k,v 1.1 2010/09/19 02:09:28 tsutsui Exp $
+# $NetBSD: std.m68k,v 1.2 2021/06/04 10:46:11 martin Exp $
#
# standard, required NetBSD/m68k options
@@ -6,3 +6,6 @@ options EXEC_ELF32 # exec ELF binaries
options EXEC_SCRIPT # exec #! scripts
options CPU_IN_CKSUM # use MD optimized cpu_in_cksum()
+
+options VMSWAP_DEFAULT_PLAINTEXT # do not encrypt swap by
+ # default (slow cpu)
Index: src/sys/arch/playstation2/conf/std.playstation2
diff -u src/sys/arch/playstation2/conf/std.playstation2:1.11 src/sys/arch/playstation2/conf/std.playstation2:1.12
--- src/sys/arch/playstation2/conf/std.playstation2:1.11 Mon Mar 31 11:43:53 2014
+++ src/sys/arch/playstation2/conf/std.playstation2 Fri Jun 4 10:46:11 2021
@@ -1,4 +1,4 @@
-# $NetBSD: std.playstation2,v 1.11 2014/03/31 11:43:53 martin Exp $
+# $NetBSD: std.playstation2,v 1.12 2021/06/04 10:46:11 martin Exp $
machine playstation2 mips
include "conf/std" # MI standard options
@@ -20,3 +20,7 @@ options __GP_SUPPORT__
makeoptions DEFTEXTADDR="0x80010000"
makeoptions DEFCOPTS="-Os -mmemcpy"
+
+options VMSWAP_DEFAULT_PLAINTEXT # do not encrypt swap by
+ # default (slow cpu)
+
Index: src/sys/arch/sh3/conf/std.sh3
diff -u src/sys/arch/sh3/conf/std.sh3:1.6 src/sys/arch/sh3/conf/std.sh3:1.7
--- src/sys/arch/sh3/conf/std.sh3:1.6 Sat Feb 2 03:06:04 2008
+++ src/sys/arch/sh3/conf/std.sh3 Fri Jun 4 10:46:11 2021
@@ -1,4 +1,4 @@
-# $NetBSD: std.sh3,v 1.6 2008/02/02 03:06:04 uwe Exp $
+# $NetBSD: std.sh3,v 1.7 2021/06/04 10:46:11 martin Exp $
#
# standard, required NetBSD/sh3 'options'
@@ -6,3 +6,7 @@ options EXEC_ELF32 # exec ELF binaries
options EXEC_SCRIPT # exec #! scripts
options CPU_IN_CKSUM # use assembler version of cpu_in_cksum()
+
+options VMSWAP_DEFAULT_PLAINTEXT # do not encrypt swap by
+ # default (slow cpu)
+
Index: src/sys/arch/sparc/conf/std.sparc
diff -u src/sys/arch/sparc/conf/std.sparc:1.23 src/sys/arch/sparc/conf/std.sparc:1.24
--- src/sys/arch/sparc/conf/std.sparc:1.23 Mon Sep 20 10:21:10 2010
+++ src/sys/arch/sparc/conf/std.sparc Fri Jun 4 10:46:11 2021
@@ -1,4 +1,4 @@
-# $NetBSD: std.sparc,v 1.23 2010/09/20 10:21:10 tsutsui Exp $
+# $NetBSD: std.sparc,v 1.24 2021/06/04 10:46:11 martin Exp $
#
# Mandatory NetBSD/sparc kernel options.
@@ -12,3 +12,7 @@ options EXEC_ELF32 # execve(2) support
options EXEC_SCRIPT # execve(2) support for scripts
options CPU_IN_CKSUM # use MD optimized cpu_in_cksum()
+
+options VMSWAP_DEFAULT_PLAINTEXT # do not encrypt swap by
+ # default (slow cpu)
+
Index: src/sys/arch/vax/conf/std.vax
diff -u src/sys/arch/vax/conf/std.vax:1.16 src/sys/arch/vax/conf/std.vax:1.17
--- src/sys/arch/vax/conf/std.vax:1.16 Sun Dec 11 12:19:34 2005
+++ src/sys/arch/vax/conf/std.vax Fri Jun 4 10:46:11 2021
@@ -1,4 +1,4 @@
-# $NetBSD: std.vax,v 1.16 2005/12/11 12:19:34 christos Exp $
+# $NetBSD: std.vax,v 1.17 2021/06/04 10:46:11 martin Exp $
#
# Std vaxfiles
#
@@ -8,3 +8,7 @@ include "conf/std" # MI standard option
options EXEC_AOUT # execve(2) support for a.out binaries
options EXEC_SCRIPT # execve(2) support for scripts
options EXEC_ELF32 # execve(2) support for ELF32 binaries
+
+options VMSWAP_DEFAULT_PLAINTEXT # do not encrypt swap by
+ # default (slow cpu)
+
