summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjdike <jdike>2003-01-20 23:25:50 +0000
committerjdike <jdike>2003-01-20 23:25:50 +0000
commitd5a4e45d65c8e242fb1317be2eb6dd6091810ca0 (patch)
tree1dc9aa5a08bd8252454f66ebfdbf6cdcce667c5c
parentdb1590db8039174cc48264ecd3f7f82abb40ecd5 (diff)
downloaduml-history-d5a4e45d65c8e242fb1317be2eb6dd6091810ca0.tar.gz
If neither CONFIG_MODE_TT or CONFIG_MODE_SKAS is defined in defconfig,
oldconfig won't give you a UML with neither built in to it.
-rw-r--r--arch/um/config.in10
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/um/config.in b/arch/um/config.in
index 887a7c6..c470ed5 100644
--- a/arch/um/config.in
+++ b/arch/um/config.in
@@ -17,11 +17,19 @@ endmenu
mainmenu_option next_comment
comment 'General Setup'
+
+bool 'Separate kernel address space support' CONFIG_MODE_SKAS
+
+# This is to ensure that at least one of the modes is enabled. When neither
+# is present in defconfig, they default to N, which is bad.
+if [ "$CONFIG_MODE_SKAS" != "y" ]; then
+ define_bool CONFIG_MODE_TT y
+fi
+
bool 'Tracing thread support' CONFIG_MODE_TT
if [ "$CONFIG_MODE_TT" != "y" ]; then
bool 'Statically linked binary when CONFIG_MODE_TT is disabled' CONFIG_STATIC_LINK
fi
-bool 'Separate kernel address space support' CONFIG_MODE_SKAS
bool 'Networking support' CONFIG_NET
bool 'System V IPC' CONFIG_SYSVIPC
bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT