aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/um/Kconfig27
-rw-r--r--arch/um/Kconfig.i3866
-rw-r--r--drivers/net/Kconfig1
3 files changed, 20 insertions, 14 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 8ff3bcbce5fc..5982fe2753e0 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -143,6 +143,7 @@ config HOSTFS
143 143
144config HPPFS 144config HPPFS
145 tristate "HoneyPot ProcFS (EXPERIMENTAL)" 145 tristate "HoneyPot ProcFS (EXPERIMENTAL)"
146 depends on EXPERIMENTAL
146 help 147 help
147 hppfs (HoneyPot ProcFS) is a filesystem which allows UML /proc 148 hppfs (HoneyPot ProcFS) is a filesystem which allows UML /proc
148 entries to be overridden, removed, or fabricated from the host. 149 entries to be overridden, removed, or fabricated from the host.
@@ -155,10 +156,6 @@ config HPPFS
155 You only need this if you are setting up a UML honeypot. Otherwise, 156 You only need this if you are setting up a UML honeypot. Otherwise,
156 it is safe to say 'N' here. 157 it is safe to say 'N' here.
157 158
158 If you are actively using it, please report any problems, since it's
159 getting fixed. In this moment, it is experimental on 2.6 (it works on
160 2.4).
161
162config MCONSOLE 159config MCONSOLE
163 bool "Management console" 160 bool "Management console"
164 default y 161 default y
@@ -243,8 +240,16 @@ config NEST_LEVEL
243 Only change this if you are running nested UMLs. 240 Only change this if you are running nested UMLs.
244 241
245config HIGHMEM 242config HIGHMEM
246 bool "Highmem support" 243 bool "Highmem support (EXPERIMENTAL)"
247 depends on !64BIT 244 depends on !64BIT && EXPERIMENTAL
245 default n
246 help
247 This was used to allow UML to run with big amounts of memory.
248 Currently it is unstable, so if unsure say N.
249
250 To use big amounts of memory, it is recommended to disable TT mode (i.e.
251 CONFIG_MODE_TT) and enable static linking (i.e. CONFIG_STATIC_LINK) -
252 this should allow the guest to use up to 2.75G of memory.
248 253
249config KERNEL_STACK_ORDER 254config KERNEL_STACK_ORDER
250 int "Kernel stack size order" 255 int "Kernel stack size order"
@@ -269,17 +274,13 @@ endmenu
269 274
270source "init/Kconfig" 275source "init/Kconfig"
271 276
272source "net/Kconfig" 277source "drivers/block/Kconfig"
273
274source "drivers/base/Kconfig"
275 278
276source "arch/um/Kconfig.char" 279source "arch/um/Kconfig.char"
277 280
278source "drivers/block/Kconfig" 281source "drivers/base/Kconfig"
279 282
280config NETDEVICES 283source "net/Kconfig"
281 bool
282 default NET
283 284
284source "arch/um/Kconfig.net" 285source "arch/um/Kconfig.net"
285 286
diff --git a/arch/um/Kconfig.i386 b/arch/um/Kconfig.i386
index c71b39a677aa..ef79ed25aecd 100644
--- a/arch/um/Kconfig.i386
+++ b/arch/um/Kconfig.i386
@@ -22,13 +22,17 @@ config TOP_ADDR
22 default 0x80000000 if HOST_2G_2G 22 default 0x80000000 if HOST_2G_2G
23 23
24config 3_LEVEL_PGTABLES 24config 3_LEVEL_PGTABLES
25 bool "Three-level pagetables" 25 bool "Three-level pagetables (EXPERIMENTAL)"
26 default n 26 default n
27 depends on EXPERIMENTAL
27 help 28 help
28 Three-level pagetables will let UML have more than 4G of physical 29 Three-level pagetables will let UML have more than 4G of physical
29 memory. All the memory that can't be mapped directly will be treated 30 memory. All the memory that can't be mapped directly will be treated
30 as high memory. 31 as high memory.
31 32
33 However, this it experimental on 32-bit architectures, so if unsure say
34 N (on x86-64 it's automatically enabled, instead, as it's safe there).
35
32config STUB_CODE 36config STUB_CODE
33 hex 37 hex
34 default 0xbfffe000 38 default 0xbfffe000
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 0c69918671ca..626508afe1b1 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -7,6 +7,7 @@ menu "Network device support"
7 7
8config NETDEVICES 8config NETDEVICES
9 depends on NET 9 depends on NET
10 default y if UML
10 bool "Network device support" 11 bool "Network device support"
11 ---help--- 12 ---help---
12 You can say N here if you don't intend to connect your Linux box to 13 You can say N here if you don't intend to connect your Linux box to