diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-15 16:49:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-15 16:49:27 -0400 |
commit | e44740c1a94b5d39b093045920f543a7bc135584 (patch) | |
tree | 3dc097e078653cc520476ac997e1765b90703a56 /arch/um/Kconfig.um | |
parent | d613896926be608796bb80454256a07b55fe0e87 (diff) | |
parent | fe205bdd1321f95f8f3c35d243ea7cb22af8fbe1 (diff) |
Merge tag 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger:
- hostfs saw a face lifting
- old/broken stuff was removed (SMP, HIGHMEM, SKAS3/4)
- random cleanups and bug fixes
* tag 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: (26 commits)
um: Print minimum physical memory requirement
um: Move uml_postsetup in the init_thread stack
um: add a kmsg_dumper
x86, UML: fix integer overflow in ELF_ET_DYN_BASE
um: hostfs: Reduce number of syscalls in readdir
um: Remove broken highmem support
um: Remove broken SMP support
um: Remove SKAS3/4 support
um: Remove ppc cruft
um: Remove ia64 cruft
um: Remove dead code from stacktrace
hostfs: No need to box and later unbox the file mode
hostfs: Use page_offset()
hostfs: Set page flags in hostfs_readpage() correctly
hostfs: Remove superfluous initializations in hostfs_open()
hostfs: hostfs_open: Reset open flags upon each retry
hostfs: Remove superfluous test in hostfs_open()
hostfs: Report append flag in ->show_options()
hostfs: Use __getname() in follow_link
hostfs: Remove open coded strcpy()
...
Diffstat (limited to 'arch/um/Kconfig.um')
-rw-r--r-- | arch/um/Kconfig.um | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/arch/um/Kconfig.um b/arch/um/Kconfig.um index 5dbfe3d9107c..6e67847f5272 100644 --- a/arch/um/Kconfig.um +++ b/arch/um/Kconfig.um | |||
@@ -95,48 +95,6 @@ config MAGIC_SYSRQ | |||
95 | The keys are documented in <file:Documentation/sysrq.txt>. Don't say Y | 95 | The keys are documented in <file:Documentation/sysrq.txt>. Don't say Y |
96 | unless you really know what this hack does. | 96 | unless you really know what this hack does. |
97 | 97 | ||
98 | config SMP | ||
99 | bool "Symmetric multi-processing support" | ||
100 | default n | ||
101 | depends on BROKEN | ||
102 | help | ||
103 | This option enables UML SMP support. | ||
104 | It is NOT related to having a real SMP box. Not directly, at least. | ||
105 | |||
106 | UML implements virtual SMP by allowing as many processes to run | ||
107 | simultaneously on the host as there are virtual processors configured. | ||
108 | |||
109 | Obviously, if the host is a uniprocessor, those processes will | ||
110 | timeshare, but, inside UML, will appear to be running simultaneously. | ||
111 | If the host is a multiprocessor, then UML processes may run | ||
112 | simultaneously, depending on the host scheduler. | ||
113 | |||
114 | This, however, is supported only in TT mode. So, if you use the SKAS | ||
115 | patch on your host, switching to TT mode and enabling SMP usually | ||
116 | gives you worse performances. | ||
117 | Also, since the support for SMP has been under-developed, there could | ||
118 | be some bugs being exposed by enabling SMP. | ||
119 | |||
120 | If you don't know what to do, say N. | ||
121 | |||
122 | config NR_CPUS | ||
123 | int "Maximum number of CPUs (2-32)" | ||
124 | range 2 32 | ||
125 | depends on SMP | ||
126 | default "32" | ||
127 | |||
128 | config HIGHMEM | ||
129 | bool "Highmem support" | ||
130 | depends on !64BIT && BROKEN | ||
131 | default n | ||
132 | help | ||
133 | This was used to allow UML to run with big amounts of memory. | ||
134 | Currently it is unstable, so if unsure say N. | ||
135 | |||
136 | To use big amounts of memory, it is recommended enable static | ||
137 | linking (i.e. CONFIG_STATIC_LINK) - this should allow the | ||
138 | guest to use up to 2.75G of memory. | ||
139 | |||
140 | config KERNEL_STACK_ORDER | 98 | config KERNEL_STACK_ORDER |
141 | int "Kernel stack size order" | 99 | int "Kernel stack size order" |
142 | default 1 if 64BIT | 100 | default 1 if 64BIT |