[PATCH] uml: use DEFCONFIG_LIST to avoid reading host's config
This should make sure that, for UML, host's configuration files are not
considered, which avoids various pains to the user. Our dependency are such
that the obtained Kconfig will be valid and will lead to successful
compilation - however they cannot prevent an user from disabling any boot
device, and if an option is not set in the read .config (say
/boot/config-XXX), with make menuconfig ARCH=um, it is not set. This always
disables UBD and all console I/O channels, which leads to non-working UML
kernels, so this bothers users - especially now, since it will happen on
almost every machine (/boot/config-`uname -r` exists almost on every machine).
It can be workarounded with make defconfig ARCH=um, but it is non-obvious and
can be avoided, so please _do_ merge this patch.
Given the existence of options, it could be interesting to implement
(additionally) "option required" - with it, Kconfig will refuse reading a
.config file (from wherever it comes) if the given option is not set. With
this, one could mark with it the option characteristic of the given
architecture (it was an old proposal of Roman Zippel, when I pointed out our
problem):
config UML
option required
default y
However this should be further discussed:
*) for x86, it must support constructs like:
==arch/i386/Kconfig==
config 64BIT
option required
default n
where Kconfig must require that CONFIG_64BIT is disabled or not present in the
read .config.
*) do we want to do such checks only for the starting defconfig or also for
.config? Which leads to:
*) I may want to port a x86_64 .config to x86 and viceversa, or even among more
different archs. Should that be allowed, and in which measure (the user may
force skipping the check for a .config or it is only given a warning by
default)?
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: <kbuild-devel@lists.sourceforge.net>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-10-20 08:28:23 +02:00
|
|
|
config DEFCONFIG_LIST
|
|
|
|
string
|
|
|
|
option defconfig_list
|
|
|
|
default "arch/$ARCH/defconfig"
|
|
|
|
|
2007-10-20 01:34:40 +02:00
|
|
|
# UML uses the generic IRQ subsystem
|
2005-04-17 00:20:36 +02:00
|
|
|
config GENERIC_HARDIRQS
|
|
|
|
bool
|
|
|
|
default y
|
|
|
|
|
|
|
|
config UML
|
|
|
|
bool
|
|
|
|
default y
|
|
|
|
|
|
|
|
config MMU
|
|
|
|
bool
|
|
|
|
default y
|
|
|
|
|
2007-02-11 16:41:31 +01:00
|
|
|
config NO_IOMEM
|
|
|
|
def_bool y
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
mainmenu "Linux/Usermode Kernel Configuration"
|
|
|
|
|
|
|
|
config ISA
|
|
|
|
bool
|
|
|
|
|
|
|
|
config SBUS
|
|
|
|
bool
|
|
|
|
|
|
|
|
config PCI
|
|
|
|
bool
|
|
|
|
|
2006-03-31 12:30:14 +02:00
|
|
|
config PCMCIA
|
|
|
|
bool
|
|
|
|
|
2006-10-11 10:21:37 +02:00
|
|
|
# Yet to do!
|
|
|
|
config TRACE_IRQFLAGS_SUPPORT
|
|
|
|
bool
|
|
|
|
default n
|
|
|
|
|
|
|
|
config LOCKDEP_SUPPORT
|
|
|
|
bool
|
|
|
|
default y
|
|
|
|
|
|
|
|
config STACKTRACE_SUPPORT
|
|
|
|
bool
|
2007-03-14 10:15:54 +01:00
|
|
|
default n
|
2006-10-11 10:21:37 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
config GENERIC_CALIBRATE_DELAY
|
|
|
|
bool
|
|
|
|
default y
|
|
|
|
|
2006-12-08 11:36:23 +01:00
|
|
|
config GENERIC_BUG
|
|
|
|
bool
|
|
|
|
default y
|
|
|
|
depends on BUG
|
|
|
|
|
2007-10-16 10:27:23 +02:00
|
|
|
config GENERIC_TIME
|
|
|
|
bool
|
|
|
|
default y
|
|
|
|
|
2007-10-16 10:27:24 +02:00
|
|
|
config GENERIC_CLOCKEVENTS
|
|
|
|
bool
|
|
|
|
default y
|
|
|
|
|
2005-06-22 02:16:24 +02:00
|
|
|
# Used in kernel/irq/manage.c and include/linux/irq.h
|
|
|
|
config IRQ_RELEASE_METHOD
|
|
|
|
bool
|
|
|
|
default y
|
|
|
|
|
2008-02-05 07:31:19 +01:00
|
|
|
config HZ
|
|
|
|
int
|
|
|
|
default 100
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
menu "UML-specific options"
|
|
|
|
|
|
|
|
config STATIC_LINK
|
|
|
|
bool "Force a static link"
|
|
|
|
default n
|
|
|
|
help
|
2007-10-16 10:26:54 +02:00
|
|
|
This option gives you the ability to force a static link of UML.
|
|
|
|
Normally, UML is linked as a shared binary. This is inconvenient for
|
|
|
|
use in a chroot jail. So, if you intend to run UML inside a chroot,
|
|
|
|
you probably want to say Y here.
|
|
|
|
Additionally, this option enables using higher memory spaces (up to
|
|
|
|
2.75G) for UML.
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2005-09-04 00:57:12 +02:00
|
|
|
source "arch/um/Kconfig.arch"
|
2005-06-23 09:07:43 +02:00
|
|
|
source "mm/Kconfig"
|
2007-10-16 10:27:23 +02:00
|
|
|
source "kernel/time/Kconfig"
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
config LD_SCRIPT_STATIC
|
|
|
|
bool
|
|
|
|
default y
|
uml: throw out CONFIG_MODE_TT
This patchset throws out tt mode, which has been non-functional for a while.
This is done in phases, interspersed with code cleanups on the affected files.
The removal is done as follows:
remove all code, config options, and files which depend on
CONFIG_MODE_TT
get rid of the CHOOSE_MODE macro, which decided whether to
call tt-mode or skas-mode code, and replace invocations with their
skas portions
replace all now-trivial procedures with their skas equivalents
There are now a bunch of now-redundant pieces of data structures, including
mode-specific pieces of the thread structure, pt_regs, and mm_context. These
are all replaced with their skas-specific contents.
As part of the ongoing style compliance project, I made a style pass over all
files that were changed. There are three such patches, one for each phase,
covering the files affected by that phase but no later ones.
I noticed that we weren't freeing the LDT state associated with a process when
it exited, so that's fixed in one of the later patches.
The last patch is a tidying patch which I've had for a while, but which caused
inexplicable crashes under tt mode. Since that is no longer a problem, this
can now go in.
This patch:
Start getting rid of tt mode support.
This patch throws out CONFIG_MODE_TT and all config options, code, and files
which depend on it.
CONFIG_MODE_SKAS is gone and everything that depends on it is included
unconditionally.
The few changed lines are in re-written Kconfig help, lines which needed
something skas-related removed from them, and a few more which weren't
strictly deletions.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-16 10:26:50 +02:00
|
|
|
depends on STATIC_LINK
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
config LD_SCRIPT_DYN
|
|
|
|
bool
|
|
|
|
default y
|
|
|
|
depends on !LD_SCRIPT_STATIC
|
|
|
|
|
|
|
|
source "fs/Kconfig.binfmt"
|
|
|
|
|
|
|
|
config HOSTFS
|
|
|
|
tristate "Host filesystem"
|
|
|
|
help
|
2007-10-16 10:26:54 +02:00
|
|
|
While the User-Mode Linux port uses its own root file system for
|
|
|
|
booting and normal file access, this module lets the UML user
|
|
|
|
access files stored on the host. It does not require any
|
|
|
|
network connection between the Host and UML. An example use of
|
|
|
|
this might be:
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-10-16 10:26:54 +02:00
|
|
|
mount none /tmp/fromhost -t hostfs -o /tmp/umlshare
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-10-16 10:26:54 +02:00
|
|
|
where /tmp/fromhost is an empty directory inside UML and
|
|
|
|
/tmp/umlshare is a directory on the host with files the UML user
|
|
|
|
wishes to access.
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-10-16 10:26:54 +02:00
|
|
|
For more information, see
|
|
|
|
<http://user-mode-linux.sourceforge.net/hostfs.html>.
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-10-16 10:26:54 +02:00
|
|
|
If you'd like to be able to work with files stored on the host,
|
|
|
|
say Y or M here; otherwise say N.
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
config HPPFS
|
|
|
|
tristate "HoneyPot ProcFS (EXPERIMENTAL)"
|
2006-01-19 02:42:59 +01:00
|
|
|
depends on EXPERIMENTAL
|
2005-04-17 00:20:36 +02:00
|
|
|
help
|
2007-10-16 10:26:54 +02:00
|
|
|
hppfs (HoneyPot ProcFS) is a filesystem which allows UML /proc
|
|
|
|
entries to be overridden, removed, or fabricated from the host.
|
|
|
|
Its purpose is to allow a UML to appear to be a physical machine
|
|
|
|
by removing or changing anything in /proc which gives away the
|
|
|
|
identity of a UML.
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2008-02-05 07:30:38 +01:00
|
|
|
See <http://user-mode-linux.sf.net/old/hppfs.html> for more information.
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-10-16 10:26:54 +02:00
|
|
|
You only need this if you are setting up a UML honeypot. Otherwise,
|
|
|
|
it is safe to say 'N' here.
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
config MCONSOLE
|
|
|
|
bool "Management console"
|
|
|
|
default y
|
|
|
|
help
|
2007-10-16 10:26:54 +02:00
|
|
|
The user mode linux management console is a low-level interface to
|
|
|
|
the kernel, somewhat like the i386 SysRq interface. Since there is
|
|
|
|
a full-blown operating system running under every user mode linux
|
|
|
|
instance, there is much greater flexibility possible than with the
|
|
|
|
SysRq mechanism.
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-10-16 10:26:54 +02:00
|
|
|
If you answer 'Y' to this option, to use this feature, you need the
|
|
|
|
mconsole client (called uml_mconsole) which is present in CVS in
|
|
|
|
2.4.5-9um and later (path /tools/mconsole), and is also in the
|
|
|
|
distribution RPM package in 2.4.6 and later.
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-10-16 10:26:54 +02:00
|
|
|
It is safe to say 'Y' here.
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
config MAGIC_SYSRQ
|
|
|
|
bool "Magic SysRq key"
|
|
|
|
depends on MCONSOLE
|
2007-10-16 10:26:54 +02:00
|
|
|
help
|
|
|
|
If you say Y here, you will have some control over the system even
|
|
|
|
if the system crashes for example during kernel debugging (e.g., you
|
|
|
|
will be able to flush the buffer cache to disk, reboot the system
|
|
|
|
immediately or dump some status information). A key for each of the
|
|
|
|
possible requests is provided.
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-10-16 10:26:54 +02:00
|
|
|
This is the feature normally accomplished by pressing a key
|
|
|
|
while holding SysRq (Alt+PrintScreen).
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-10-16 10:26:54 +02:00
|
|
|
On UML, this is accomplished by sending a "sysrq" command with
|
|
|
|
mconsole, followed by the letter for the requested command.
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-10-16 10:26:54 +02:00
|
|
|
The keys are documented in <file:Documentation/sysrq.txt>. Don't say Y
|
|
|
|
unless you really know what this hack does.
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
config SMP
|
|
|
|
bool "Symmetric multi-processing support (EXPERIMENTAL)"
|
|
|
|
default n
|
2008-02-05 07:30:41 +01:00
|
|
|
depends on BROKEN
|
2005-04-17 00:20:36 +02:00
|
|
|
help
|
2007-10-16 10:26:54 +02:00
|
|
|
This option enables UML SMP support.
|
|
|
|
It is NOT related to having a real SMP box. Not directly, at least.
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-10-16 10:26:54 +02:00
|
|
|
UML implements virtual SMP by allowing as many processes to run
|
|
|
|
simultaneously on the host as there are virtual processors configured.
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-10-16 10:26:54 +02:00
|
|
|
Obviously, if the host is a uniprocessor, those processes will
|
|
|
|
timeshare, but, inside UML, will appear to be running simultaneously.
|
|
|
|
If the host is a multiprocessor, then UML processes may run
|
|
|
|
simultaneously, depending on the host scheduler.
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-10-16 10:26:54 +02:00
|
|
|
This, however, is supported only in TT mode. So, if you use the SKAS
|
|
|
|
patch on your host, switching to TT mode and enabling SMP usually
|
|
|
|
gives you worse performances.
|
|
|
|
Also, since the support for SMP has been under-developed, there could
|
|
|
|
be some bugs being exposed by enabling SMP.
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2007-10-16 10:26:54 +02:00
|
|
|
If you don't know what to do, say N.
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
config NR_CPUS
|
|
|
|
int "Maximum number of CPUs (2-32)"
|
|
|
|
range 2 32
|
|
|
|
depends on SMP
|
|
|
|
default "32"
|
|
|
|
|
|
|
|
config HIGHMEM
|
2006-01-19 02:42:59 +01:00
|
|
|
bool "Highmem support (EXPERIMENTAL)"
|
|
|
|
depends on !64BIT && EXPERIMENTAL
|
|
|
|
default n
|
|
|
|
help
|
2007-10-16 10:26:54 +02:00
|
|
|
This was used to allow UML to run with big amounts of memory.
|
|
|
|
Currently it is unstable, so if unsure say N.
|
2006-01-19 02:42:59 +01:00
|
|
|
|
2007-10-16 10:26:54 +02:00
|
|
|
To use big amounts of memory, it is recommended enable static
|
|
|
|
linking (i.e. CONFIG_STATIC_LINK) - this should allow the
|
|
|
|
guest to use up to 2.75G of memory.
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
config KERNEL_STACK_ORDER
|
|
|
|
int "Kernel stack size order"
|
2007-05-11 07:22:35 +02:00
|
|
|
default 1 if 64BIT
|
2007-06-08 22:46:49 +02:00
|
|
|
range 1 10 if 64BIT
|
2007-05-11 07:22:35 +02:00
|
|
|
default 0 if !64BIT
|
2005-04-17 00:20:36 +02:00
|
|
|
help
|
2007-10-16 10:26:54 +02:00
|
|
|
This option determines the size of UML kernel stacks. They will
|
|
|
|
be 1 << order pages. The default is OK unless you're running Valgrind
|
|
|
|
on UML, in which case, set this to 3.
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
endmenu
|
|
|
|
|
|
|
|
source "init/Kconfig"
|
|
|
|
|
2006-01-19 02:42:59 +01:00
|
|
|
source "drivers/block/Kconfig"
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2005-09-04 00:57:12 +02:00
|
|
|
source "arch/um/Kconfig.char"
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2006-01-19 02:42:59 +01:00
|
|
|
source "drivers/base/Kconfig"
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2006-01-19 02:42:59 +01:00
|
|
|
source "net/Kconfig"
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2005-09-04 00:57:12 +02:00
|
|
|
source "arch/um/Kconfig.net"
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2005-07-12 06:03:49 +02:00
|
|
|
source "drivers/net/Kconfig"
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2005-12-18 17:50:37 +01:00
|
|
|
source "drivers/connector/Kconfig"
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
source "fs/Kconfig"
|
|
|
|
|
|
|
|
source "security/Kconfig"
|
|
|
|
|
|
|
|
source "crypto/Kconfig"
|
|
|
|
|
|
|
|
source "lib/Kconfig"
|
|
|
|
|
2007-05-09 11:33:20 +02:00
|
|
|
source "drivers/scsi/Kconfig"
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
source "drivers/md/Kconfig"
|
|
|
|
|
|
|
|
if BROKEN
|
|
|
|
source "drivers/mtd/Kconfig"
|
|
|
|
endif
|
|
|
|
|
|
|
|
#This is just to shut up some Kconfig warnings, so no prompt.
|
|
|
|
config INPUT
|
|
|
|
bool
|
|
|
|
default n
|
|
|
|
|
|
|
|
source "arch/um/Kconfig.debug"
|