diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 04:26:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:05 -0400 |
commit | 4c9e13851315a25a705e7a686116e491041ca228 (patch) | |
tree | a323e1dcfe89f6c9d7e873a1bf2ad7aab9cdb9e6 /arch/um/Kconfig | |
parent | c28b59d4779a43e9b7e786c7004cbee8fab1527d (diff) |
uml: style fixes pass 1
Formatting changes in the files which have been changed in the
tt-removal patchset so far. These include:
copyright updates
header file trimming
style fixes
adding severity to printks
indenting Kconfig help according to the predominant kernel style
These changes should be entirely non-functional.
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>
Diffstat (limited to 'arch/um/Kconfig')
-rw-r--r-- | arch/um/Kconfig | 189 |
1 files changed, 95 insertions, 94 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index a0e47e27115..4aabb334a84 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig | |||
@@ -66,12 +66,12 @@ config STATIC_LINK | |||
66 | bool "Force a static link" | 66 | bool "Force a static link" |
67 | default n | 67 | default n |
68 | help | 68 | help |
69 | This option gives you the ability to force a static link of UML. | 69 | This option gives you the ability to force a static link of UML. |
70 | Normally, UML is linked as a shared binary. This is inconvenient for | 70 | Normally, UML is linked as a shared binary. This is inconvenient for |
71 | use in a chroot jail. So, if you intend to run UML inside a chroot, | 71 | use in a chroot jail. So, if you intend to run UML inside a chroot, |
72 | you probably want to say Y here. | 72 | you probably want to say Y here. |
73 | Additionally, this option enables using higher memory spaces (up to | 73 | Additionally, this option enables using higher memory spaces (up to |
74 | 2.75G) for UML. | 74 | 2.75G) for UML. |
75 | 75 | ||
76 | source "arch/um/Kconfig.arch" | 76 | source "arch/um/Kconfig.arch" |
77 | source "mm/Kconfig" | 77 | source "mm/Kconfig" |
@@ -89,18 +89,18 @@ config LD_SCRIPT_DYN | |||
89 | config NET | 89 | config NET |
90 | bool "Networking support" | 90 | bool "Networking support" |
91 | help | 91 | help |
92 | Unless you really know what you are doing, you should say Y here. | 92 | Unless you really know what you are doing, you should say Y here. |
93 | The reason is that some programs need kernel networking support even | 93 | The reason is that some programs need kernel networking support even |
94 | when running on a stand-alone machine that isn't connected to any | 94 | when running on a stand-alone machine that isn't connected to any |
95 | other computer. If you are upgrading from an older kernel, you | 95 | other computer. If you are upgrading from an older kernel, you |
96 | should consider updating your networking tools too because changes | 96 | should consider updating your networking tools too because changes |
97 | in the kernel and the tools often go hand in hand. The tools are | 97 | in the kernel and the tools often go hand in hand. The tools are |
98 | contained in the package net-tools, the location and version number | 98 | contained in the package net-tools, the location and version number |
99 | of which are given in <file:Documentation/Changes>. | 99 | of which are given in <file:Documentation/Changes>. |
100 | 100 | ||
101 | For a general introduction to Linux networking, it is highly | 101 | For a general introduction to Linux networking, it is highly |
102 | recommended to read the NET-HOWTO, available from | 102 | recommended to read the NET-HOWTO, available from |
103 | <http://www.tldp.org/docs.html#howto>. | 103 | <http://www.tldp.org/docs.html#howto>. |
104 | 104 | ||
105 | 105 | ||
106 | source "fs/Kconfig.binfmt" | 106 | source "fs/Kconfig.binfmt" |
@@ -108,74 +108,74 @@ source "fs/Kconfig.binfmt" | |||
108 | config HOSTFS | 108 | config HOSTFS |
109 | tristate "Host filesystem" | 109 | tristate "Host filesystem" |
110 | help | 110 | help |
111 | While the User-Mode Linux port uses its own root file system for | 111 | While the User-Mode Linux port uses its own root file system for |
112 | booting and normal file access, this module lets the UML user | 112 | booting and normal file access, this module lets the UML user |
113 | access files stored on the host. It does not require any | 113 | access files stored on the host. It does not require any |
114 | network connection between the Host and UML. An example use of | 114 | network connection between the Host and UML. An example use of |
115 | this might be: | 115 | this might be: |
116 | 116 | ||
117 | mount none /tmp/fromhost -t hostfs -o /tmp/umlshare | 117 | mount none /tmp/fromhost -t hostfs -o /tmp/umlshare |
118 | 118 | ||
119 | where /tmp/fromhost is an empty directory inside UML and | 119 | where /tmp/fromhost is an empty directory inside UML and |
120 | /tmp/umlshare is a directory on the host with files the UML user | 120 | /tmp/umlshare is a directory on the host with files the UML user |
121 | wishes to access. | 121 | wishes to access. |
122 | 122 | ||
123 | For more information, see | 123 | For more information, see |
124 | <http://user-mode-linux.sourceforge.net/hostfs.html>. | 124 | <http://user-mode-linux.sourceforge.net/hostfs.html>. |
125 | 125 | ||
126 | If you'd like to be able to work with files stored on the host, | 126 | If you'd like to be able to work with files stored on the host, |
127 | say Y or M here; otherwise say N. | 127 | say Y or M here; otherwise say N. |
128 | 128 | ||
129 | config HPPFS | 129 | config HPPFS |
130 | tristate "HoneyPot ProcFS (EXPERIMENTAL)" | 130 | tristate "HoneyPot ProcFS (EXPERIMENTAL)" |
131 | depends on EXPERIMENTAL | 131 | depends on EXPERIMENTAL |
132 | help | 132 | help |
133 | hppfs (HoneyPot ProcFS) is a filesystem which allows UML /proc | 133 | hppfs (HoneyPot ProcFS) is a filesystem which allows UML /proc |
134 | entries to be overridden, removed, or fabricated from the host. | 134 | entries to be overridden, removed, or fabricated from the host. |
135 | Its purpose is to allow a UML to appear to be a physical machine | 135 | Its purpose is to allow a UML to appear to be a physical machine |
136 | by removing or changing anything in /proc which gives away the | 136 | by removing or changing anything in /proc which gives away the |
137 | identity of a UML. | 137 | identity of a UML. |
138 | 138 | ||
139 | See <http://user-mode-linux.sf.net/hppfs.html> for more information. | 139 | See <http://user-mode-linux.sf.net/hppfs.html> for more information. |
140 | 140 | ||
141 | You only need this if you are setting up a UML honeypot. Otherwise, | 141 | You only need this if you are setting up a UML honeypot. Otherwise, |
142 | it is safe to say 'N' here. | 142 | it is safe to say 'N' here. |
143 | 143 | ||
144 | config MCONSOLE | 144 | config MCONSOLE |
145 | bool "Management console" | 145 | bool "Management console" |
146 | default y | 146 | default y |
147 | help | 147 | help |
148 | The user mode linux management console is a low-level interface to | 148 | The user mode linux management console is a low-level interface to |
149 | the kernel, somewhat like the i386 SysRq interface. Since there is | 149 | the kernel, somewhat like the i386 SysRq interface. Since there is |
150 | a full-blown operating system running under every user mode linux | 150 | a full-blown operating system running under every user mode linux |
151 | instance, there is much greater flexibility possible than with the | 151 | instance, there is much greater flexibility possible than with the |
152 | SysRq mechanism. | 152 | SysRq mechanism. |
153 | 153 | ||
154 | If you answer 'Y' to this option, to use this feature, you need the | 154 | If you answer 'Y' to this option, to use this feature, you need the |
155 | mconsole client (called uml_mconsole) which is present in CVS in | 155 | mconsole client (called uml_mconsole) which is present in CVS in |
156 | 2.4.5-9um and later (path /tools/mconsole), and is also in the | 156 | 2.4.5-9um and later (path /tools/mconsole), and is also in the |
157 | distribution RPM package in 2.4.6 and later. | 157 | distribution RPM package in 2.4.6 and later. |
158 | 158 | ||
159 | It is safe to say 'Y' here. | 159 | It is safe to say 'Y' here. |
160 | 160 | ||
161 | config MAGIC_SYSRQ | 161 | config MAGIC_SYSRQ |
162 | bool "Magic SysRq key" | 162 | bool "Magic SysRq key" |
163 | depends on MCONSOLE | 163 | depends on MCONSOLE |
164 | ---help--- | 164 | help |
165 | If you say Y here, you will have some control over the system even | 165 | If you say Y here, you will have some control over the system even |
166 | if the system crashes for example during kernel debugging (e.g., you | 166 | if the system crashes for example during kernel debugging (e.g., you |
167 | will be able to flush the buffer cache to disk, reboot the system | 167 | will be able to flush the buffer cache to disk, reboot the system |
168 | immediately or dump some status information). A key for each of the | 168 | immediately or dump some status information). A key for each of the |
169 | possible requests is provided. | 169 | possible requests is provided. |
170 | 170 | ||
171 | This is the feature normally accomplished by pressing a key | 171 | This is the feature normally accomplished by pressing a key |
172 | while holding SysRq (Alt+PrintScreen). | 172 | while holding SysRq (Alt+PrintScreen). |
173 | 173 | ||
174 | On UML, this is accomplished by sending a "sysrq" command with | 174 | On UML, this is accomplished by sending a "sysrq" command with |
175 | mconsole, followed by the letter for the requested command. | 175 | mconsole, followed by the letter for the requested command. |
176 | 176 | ||
177 | The keys are documented in <file:Documentation/sysrq.txt>. Don't say Y | 177 | The keys are documented in <file:Documentation/sysrq.txt>. Don't say Y |
178 | unless you really know what this hack does. | 178 | unless you really know what this hack does. |
179 | 179 | ||
180 | config SMP | 180 | config SMP |
181 | bool "Symmetric multi-processing support (EXPERIMENTAL)" | 181 | bool "Symmetric multi-processing support (EXPERIMENTAL)" |
@@ -183,24 +183,24 @@ config SMP | |||
183 | #SMP_BROKEN is for x86_64. | 183 | #SMP_BROKEN is for x86_64. |
184 | depends on EXPERIMENTAL && (!SMP_BROKEN || (BROKEN && SMP_BROKEN)) | 184 | depends on EXPERIMENTAL && (!SMP_BROKEN || (BROKEN && SMP_BROKEN)) |
185 | help | 185 | help |
186 | This option enables UML SMP support. | 186 | This option enables UML SMP support. |
187 | It is NOT related to having a real SMP box. Not directly, at least. | 187 | It is NOT related to having a real SMP box. Not directly, at least. |
188 | 188 | ||
189 | UML implements virtual SMP by allowing as many processes to run | 189 | UML implements virtual SMP by allowing as many processes to run |
190 | simultaneously on the host as there are virtual processors configured. | 190 | simultaneously on the host as there are virtual processors configured. |
191 | 191 | ||
192 | Obviously, if the host is a uniprocessor, those processes will | 192 | Obviously, if the host is a uniprocessor, those processes will |
193 | timeshare, but, inside UML, will appear to be running simultaneously. | 193 | timeshare, but, inside UML, will appear to be running simultaneously. |
194 | If the host is a multiprocessor, then UML processes may run | 194 | If the host is a multiprocessor, then UML processes may run |
195 | simultaneously, depending on the host scheduler. | 195 | simultaneously, depending on the host scheduler. |
196 | 196 | ||
197 | This, however, is supported only in TT mode. So, if you use the SKAS | 197 | This, however, is supported only in TT mode. So, if you use the SKAS |
198 | patch on your host, switching to TT mode and enabling SMP usually gives | 198 | patch on your host, switching to TT mode and enabling SMP usually |
199 | you worse performances. | 199 | gives you worse performances. |
200 | Also, since the support for SMP has been under-developed, there could | 200 | Also, since the support for SMP has been under-developed, there could |
201 | be some bugs being exposed by enabling SMP. | 201 | be some bugs being exposed by enabling SMP. |
202 | 202 | ||
203 | If you don't know what to do, say N. | 203 | If you don't know what to do, say N. |
204 | 204 | ||
205 | config NR_CPUS | 205 | config NR_CPUS |
206 | int "Maximum number of CPUs (2-32)" | 206 | int "Maximum number of CPUs (2-32)" |
@@ -212,24 +212,24 @@ config NEST_LEVEL | |||
212 | int "Nesting level" | 212 | int "Nesting level" |
213 | default "0" | 213 | default "0" |
214 | help | 214 | help |
215 | This is set to the number of layers of UMLs that this UML will be run | 215 | This is set to the number of layers of UMLs that this UML will be run |
216 | in. Normally, this is zero, meaning that it will run directly on the | 216 | in. Normally, this is zero, meaning that it will run directly on the |
217 | host. Setting it to one will build a UML that can run inside a UML | 217 | host. Setting it to one will build a UML that can run inside a UML |
218 | that is running on the host. Generally, if you intend this UML to run | 218 | that is running on the host. Generally, if you intend this UML to run |
219 | inside another UML, set CONFIG_NEST_LEVEL to one more than the host | 219 | inside another UML, set CONFIG_NEST_LEVEL to one more than the host |
220 | UML. | 220 | UML. |
221 | 221 | ||
222 | config HIGHMEM | 222 | config HIGHMEM |
223 | bool "Highmem support (EXPERIMENTAL)" | 223 | bool "Highmem support (EXPERIMENTAL)" |
224 | depends on !64BIT && EXPERIMENTAL | 224 | depends on !64BIT && EXPERIMENTAL |
225 | default n | 225 | default n |
226 | help | 226 | help |
227 | This was used to allow UML to run with big amounts of memory. | 227 | This was used to allow UML to run with big amounts of memory. |
228 | Currently it is unstable, so if unsure say N. | 228 | Currently it is unstable, so if unsure say N. |
229 | 229 | ||
230 | To use big amounts of memory, it is recommended enable static | 230 | To use big amounts of memory, it is recommended enable static |
231 | linking (i.e. CONFIG_STATIC_LINK) - this should allow the | 231 | linking (i.e. CONFIG_STATIC_LINK) - this should allow the |
232 | guest to use up to 2.75G of memory. | 232 | guest to use up to 2.75G of memory. |
233 | 233 | ||
234 | config KERNEL_STACK_ORDER | 234 | config KERNEL_STACK_ORDER |
235 | int "Kernel stack size order" | 235 | int "Kernel stack size order" |
@@ -237,20 +237,21 @@ config KERNEL_STACK_ORDER | |||
237 | range 1 10 if 64BIT | 237 | range 1 10 if 64BIT |
238 | default 0 if !64BIT | 238 | default 0 if !64BIT |
239 | help | 239 | help |
240 | This option determines the size of UML kernel stacks. They will | 240 | This option determines the size of UML kernel stacks. They will |
241 | be 1 << order pages. The default is OK unless you're running Valgrind | 241 | be 1 << order pages. The default is OK unless you're running Valgrind |
242 | on UML, in which case, set this to 3. | 242 | on UML, in which case, set this to 3. |
243 | 243 | ||
244 | config UML_REAL_TIME_CLOCK | 244 | config UML_REAL_TIME_CLOCK |
245 | bool "Real-time Clock" | 245 | bool "Real-time Clock" |
246 | default y | 246 | default y |
247 | help | 247 | help |
248 | This option makes UML time deltas match wall clock deltas. This should | 248 | This option makes UML time deltas match wall clock deltas. This |
249 | normally be enabled. The exception would be if you are debugging with | 249 | should normally be enabled. The exception would be if you are |
250 | UML and spend long times with UML stopped at a breakpoint. In this | 250 | debugging with UML and spend long times with UML stopped at a |
251 | case, when UML is restarted, it will call the timer enough times to make | 251 | breakpoint. In this case, when UML is restarted, it will call the |
252 | up for the time spent at the breakpoint. This could result in a | 252 | timer enough times to make up for the time spent at the breakpoint. |
253 | noticeable lag. If this is a problem, then disable this option. | 253 | This could result in a noticeable lag. If this is a problem, then |
254 | disable this option. | ||
254 | 255 | ||
255 | endmenu | 256 | endmenu |
256 | 257 | ||