Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce2d2aed authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] uml: arch Kconfig menu cleanups 



*) mark as "EXPERIMENTAL" various items that either aren't very stable or
   that are actively crashing the setup of users which don't really need them
   (i.e.  HIGHMEM and 3-level pagetables on x86 - nobody needs either,
   everybody reports "I'm using it and getting trouble").

*) move net/Kconfig near to the rest of network configurations, and
   drivers/block/Kconfig near "Block layer" submenu.

*) it's useless and doesn't work well to force NETDEVICES on and to disable
   the prompt like it's done.  Better remove the attempt, and change that to a
   simple "default y if UML".

*) drop the warning about "report problems about HPPFS" - it's redundant
   anyway, as that's the usual procedure, and HPPFS users are especially
   technical (i.e.  they know reporting bugs is _good_).

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b6316293

arch/um/Kconfig

+14 −13
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ config HOSTFS 


config HPPFS

	tristate "HoneyPot ProcFS (EXPERIMENTAL)"

	depends on EXPERIMENTAL

	help

	hppfs (HoneyPot ProcFS) is a filesystem which allows UML /proc

	entries to be overridden, removed, or fabricated from the host.
@@ -155,10 +156,6 @@ config HPPFS 
	You only need this if you are setting up a UML honeypot.  Otherwise,

	it is safe to say 'N' here.



	If you are actively using it, please report any problems, since it's

	getting fixed. In this moment, it is experimental on 2.6 (it works on

	2.4).



config MCONSOLE

	bool "Management console"

	default y
@@ -243,8 +240,16 @@ config NEST_LEVEL 
        Only change this if you are running nested UMLs.



config HIGHMEM

	bool "Highmem support"

	depends on !64BIT

	bool "Highmem support (EXPERIMENTAL)"

	depends on !64BIT && EXPERIMENTAL

	default n

	help

	This was used to allow UML to run with big amounts of memory.

	Currently it is unstable, so if unsure say N.



	To use big amounts of memory, it is recommended to disable TT mode (i.e.

	CONFIG_MODE_TT) and enable static linking (i.e. CONFIG_STATIC_LINK) -

	this should allow the guest to use up to 2.75G of memory.



config KERNEL_STACK_ORDER

	int "Kernel stack size order"
@@ -269,17 +274,13 @@ endmenu 


source "init/Kconfig"



source "net/Kconfig"



source "drivers/base/Kconfig"

source "drivers/block/Kconfig"



source "arch/um/Kconfig.char"



source "drivers/block/Kconfig"

source "drivers/base/Kconfig"



config NETDEVICES

	bool

	default NET

source "net/Kconfig"



source "arch/um/Kconfig.net"

arch/um/Kconfig.i386

+5 −1
Original line number Diff line number Diff line
@@ -22,13 +22,17 @@ config TOP_ADDR 
 	default 0x80000000 if HOST_2G_2G



config 3_LEVEL_PGTABLES

	bool "Three-level pagetables"

	bool "Three-level pagetables (EXPERIMENTAL)"

	default n

	depends on EXPERIMENTAL

	help

	Three-level pagetables will let UML have more than 4G of physical

	memory.  All the memory that can't be mapped directly will be treated

	as high memory.



	However, this it experimental on 32-bit architectures, so if unsure say

	N (on x86-64 it's automatically enabled, instead, as it's safe there).



config STUB_CODE

	hex

	default 0xbfffe000

drivers/net/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ menu "Network device support" 


config NETDEVICES

	depends on NET

	default y if UML

	bool "Network device support"

	---help---

	  You can say N here if you don't intend to connect your Linux box to