aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/s390/Kconfig385
-rw-r--r--arch/s390/kvm/Kconfig2
2 files changed, 196 insertions, 191 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index a7088dc06d2c..16506b28cb72 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -55,6 +55,12 @@ config VIRT_CPU_ACCOUNTING
55config ARCH_SUPPORTS_DEBUG_PAGEALLOC 55config ARCH_SUPPORTS_DEBUG_PAGEALLOC
56 def_bool y 56 def_bool y
57 57
58config KEXEC
59 def_bool y
60
61config AUDIT_ARCH
62 def_bool y
63
58config S390 64config S390
59 def_bool y 65 def_bool y
60 select USE_GENERIC_SMP_HELPERS if SMP 66 select USE_GENERIC_SMP_HELPERS if SMP
@@ -134,9 +140,79 @@ source "init/Kconfig"
134 140
135source "kernel/Kconfig.freezer" 141source "kernel/Kconfig.freezer"
136 142
137menu "Base setup" 143menu "Processor type and features"
144
145config HAVE_MARCH_Z900_FEATURES
146 def_bool n
147
148config HAVE_MARCH_Z990_FEATURES
149 def_bool n
150 select HAVE_MARCH_Z900_FEATURES
151
152config HAVE_MARCH_Z9_109_FEATURES
153 def_bool n
154 select HAVE_MARCH_Z990_FEATURES
155
156config HAVE_MARCH_Z10_FEATURES
157 def_bool n
158 select HAVE_MARCH_Z9_109_FEATURES
159
160config HAVE_MARCH_Z196_FEATURES
161 def_bool n
162 select HAVE_MARCH_Z10_FEATURES
163
164choice
165 prompt "Processor type"
166 default MARCH_G5
167
168config MARCH_G5
169 bool "System/390 model G5 and G6"
170 depends on !64BIT
171 help
172 Select this to build a 31 bit kernel that works
173 on all ESA/390 and z/Architecture machines.
174
175config MARCH_Z900
176 bool "IBM zSeries model z800 and z900"
177 select HAVE_MARCH_Z900_FEATURES if 64BIT
178 help
179 Select this to enable optimizations for model z800/z900 (2064 and
180 2066 series). This will enable some optimizations that are not
181 available on older ESA/390 (31 Bit) only CPUs.
182
183config MARCH_Z990
184 bool "IBM zSeries model z890 and z990"
185 select HAVE_MARCH_Z990_FEATURES if 64BIT
186 help
187 Select this to enable optimizations for model z890/z990 (2084 and
188 2086 series). The kernel will be slightly faster but will not work
189 on older machines.
190
191config MARCH_Z9_109
192 bool "IBM System z9"
193 select HAVE_MARCH_Z9_109_FEATURES if 64BIT
194 help
195 Select this to enable optimizations for IBM System z9 (2094 and
196 2096 series). The kernel will be slightly faster but will not work
197 on older machines.
198
199config MARCH_Z10
200 bool "IBM System z10"
201 select HAVE_MARCH_Z10_FEATURES if 64BIT
202 help
203 Select this to enable optimizations for IBM System z10 (2097 and
204 2098 series). The kernel will be slightly faster but will not work
205 on older machines.
206
207config MARCH_Z196
208 bool "IBM zEnterprise 114 and 196"
209 select HAVE_MARCH_Z196_FEATURES if 64BIT
210 help
211 Select this to enable optimizations for IBM zEnterprise 114 and 196
212 (2818 and 2817 series). The kernel will be slightly faster but will
213 not work on older machines.
138 214
139comment "Processor type and features" 215endchoice
140 216
141config 64BIT 217config 64BIT
142 def_bool y 218 def_bool y
@@ -148,6 +224,24 @@ config 64BIT
148config 32BIT 224config 32BIT
149 def_bool y if !64BIT 225 def_bool y if !64BIT
150 226
227config COMPAT
228 def_bool y
229 prompt "Kernel support for 31 bit emulation"
230 depends on 64BIT
231 select COMPAT_BINFMT_ELF if BINFMT_ELF
232 select ARCH_WANT_OLD_COMPAT_IPC
233 help
234 Select this option if you want to enable your system kernel to
235 handle system-calls from ELF binaries for 31 bit ESA. This option
236 (and some other stuff like libraries and such) is needed for
237 executing 31 bit applications. It is safe to say "Y".
238
239config SYSVIPC_COMPAT
240 def_bool y if COMPAT && SYSVIPC
241
242config KEYS_COMPAT
243 def_bool y if COMPAT && KEYS
244
151config SMP 245config SMP
152 def_bool y 246 def_bool y
153 prompt "Symmetric multi-processing support" 247 prompt "Symmetric multi-processing support"
@@ -203,6 +297,8 @@ config SCHED_BOOK
203 Book scheduler support improves the CPU scheduler's decision making 297 Book scheduler support improves the CPU scheduler's decision making
204 when dealing with machines that have several books. 298 when dealing with machines that have several books.
205 299
300source kernel/Kconfig.preempt
301
206config MATHEMU 302config MATHEMU
207 def_bool y 303 def_bool y
208 prompt "IEEE FPU emulation" 304 prompt "IEEE FPU emulation"
@@ -212,100 +308,35 @@ config MATHEMU
212 on older ESA/390 machines. Say Y unless you know your machine doesn't 308 on older ESA/390 machines. Say Y unless you know your machine doesn't
213 need this. 309 need this.
214 310
215config COMPAT 311source kernel/Kconfig.hz
216 def_bool y
217 prompt "Kernel support for 31 bit emulation"
218 depends on 64BIT
219 select COMPAT_BINFMT_ELF if BINFMT_ELF
220 select ARCH_WANT_OLD_COMPAT_IPC
221 help
222 Select this option if you want to enable your system kernel to
223 handle system-calls from ELF binaries for 31 bit ESA. This option
224 (and some other stuff like libraries and such) is needed for
225 executing 31 bit applications. It is safe to say "Y".
226 312
227config SYSVIPC_COMPAT 313endmenu
228 def_bool y if COMPAT && SYSVIPC
229 314
230config KEYS_COMPAT 315menu "Memory setup"
231 def_bool y if COMPAT && KEYS
232 316
233config AUDIT_ARCH 317config ARCH_SPARSEMEM_ENABLE
234 def_bool y 318 def_bool y
319 select SPARSEMEM_VMEMMAP_ENABLE
320 select SPARSEMEM_VMEMMAP
321 select SPARSEMEM_STATIC if !64BIT
235 322
236config HAVE_MARCH_Z900_FEATURES 323config ARCH_SPARSEMEM_DEFAULT
237 def_bool n 324 def_bool y
238
239config HAVE_MARCH_Z990_FEATURES
240 def_bool n
241 select HAVE_MARCH_Z900_FEATURES
242
243config HAVE_MARCH_Z9_109_FEATURES
244 def_bool n
245 select HAVE_MARCH_Z990_FEATURES
246
247config HAVE_MARCH_Z10_FEATURES
248 def_bool n
249 select HAVE_MARCH_Z9_109_FEATURES
250
251config HAVE_MARCH_Z196_FEATURES
252 def_bool n
253 select HAVE_MARCH_Z10_FEATURES
254
255comment "Code generation options"
256
257choice
258 prompt "Processor type"
259 default MARCH_G5
260
261config MARCH_G5
262 bool "System/390 model G5 and G6"
263 depends on !64BIT
264 help
265 Select this to build a 31 bit kernel that works
266 on all ESA/390 and z/Architecture machines.
267
268config MARCH_Z900
269 bool "IBM zSeries model z800 and z900"
270 select HAVE_MARCH_Z900_FEATURES if 64BIT
271 help
272 Select this to enable optimizations for model z800/z900 (2064 and
273 2066 series). This will enable some optimizations that are not
274 available on older ESA/390 (31 Bit) only CPUs.
275 325
276config MARCH_Z990 326config ARCH_SELECT_MEMORY_MODEL
277 bool "IBM zSeries model z890 and z990" 327 def_bool y
278 select HAVE_MARCH_Z990_FEATURES if 64BIT
279 help
280 Select this to enable optimizations for model z890/z990 (2084 and
281 2086 series). The kernel will be slightly faster but will not work
282 on older machines.
283 328
284config MARCH_Z9_109 329config ARCH_ENABLE_MEMORY_HOTPLUG
285 bool "IBM System z9" 330 def_bool y if SPARSEMEM
286 select HAVE_MARCH_Z9_109_FEATURES if 64BIT
287 help
288 Select this to enable optimizations for IBM System z9 (2094 and
289 2096 series). The kernel will be slightly faster but will not work
290 on older machines.
291 331
292config MARCH_Z10 332config ARCH_ENABLE_MEMORY_HOTREMOVE
293 bool "IBM System z10" 333 def_bool y
294 select HAVE_MARCH_Z10_FEATURES if 64BIT
295 help
296 Select this to enable optimizations for IBM System z10 (2097 and
297 2098 series). The kernel will be slightly faster but will not work
298 on older machines.
299 334
300config MARCH_Z196 335config FORCE_MAX_ZONEORDER
301 bool "IBM zEnterprise 114 and 196" 336 int
302 select HAVE_MARCH_Z196_FEATURES if 64BIT 337 default "9"
303 help
304 Select this to enable optimizations for IBM zEnterprise 114 and 196
305 (2818 and 2817 series). The kernel will be slightly faster but will
306 not work on older machines.
307 338
308endchoice 339source "mm/Kconfig"
309 340
310config PACK_STACK 341config PACK_STACK
311 def_bool y 342 def_bool y
@@ -369,34 +400,9 @@ config WARN_DYNAMIC_STACK
369 400
370 Say N if you are unsure. 401 Say N if you are unsure.
371 402
372comment "Kernel preemption" 403endmenu
373
374source "kernel/Kconfig.preempt"
375
376config ARCH_SPARSEMEM_ENABLE
377 def_bool y
378 select SPARSEMEM_VMEMMAP_ENABLE
379 select SPARSEMEM_VMEMMAP
380 select SPARSEMEM_STATIC if !64BIT
381
382config ARCH_SPARSEMEM_DEFAULT
383 def_bool y
384
385config ARCH_SELECT_MEMORY_MODEL
386 def_bool y
387
388config ARCH_ENABLE_MEMORY_HOTPLUG
389 def_bool y if SPARSEMEM
390
391config ARCH_ENABLE_MEMORY_HOTREMOVE
392 def_bool y
393
394config ARCH_HIBERNATION_POSSIBLE
395 def_bool y if 64BIT
396
397source "mm/Kconfig"
398 404
399comment "I/O subsystem configuration" 405menu "I/O subsystem"
400 406
401config QDIO 407config QDIO
402 def_tristate y 408 def_tristate y
@@ -427,13 +433,84 @@ config CHSC_SCH
427 433
428 If unsure, say N. 434 If unsure, say N.
429 435
430comment "Misc" 436endmenu
437
438menu "Dump support"
439
440config CRASH_DUMP
441 bool "kernel crash dumps"
442 depends on 64BIT && SMP
443 select KEXEC
444 help
445 Generate crash dump after being started by kexec.
446 Crash dump kernels are loaded in the main kernel with kexec-tools
447 into a specially reserved region and then later executed after
448 a crash by kdump/kexec.
449 For more details see Documentation/kdump/kdump.txt
450
451config ZFCPDUMP
452 def_bool n
453 prompt "zfcpdump support"
454 select SMP
455 help
456 Select this option if you want to build an zfcpdump enabled kernel.
457 Refer to <file:Documentation/s390/zfcpdump.txt> for more details on this.
458
459endmenu
460
461menu "Executable file formats / Emulations"
431 462
432source "fs/Kconfig.binfmt" 463source "fs/Kconfig.binfmt"
433 464
434config FORCE_MAX_ZONEORDER 465config SECCOMP
435 int 466 def_bool y
436 default "9" 467 prompt "Enable seccomp to safely compute untrusted bytecode"
468 depends on PROC_FS
469 help
470 This kernel feature is useful for number crunching applications
471 that may need to compute untrusted bytecode during their
472 execution. By using pipes or other transports made available to
473 the process as file descriptors supporting the read/write
474 syscalls, it's possible to isolate those applications in
475 their own address space using seccomp. Once seccomp is
476 enabled via /proc/<pid>/seccomp, it cannot be disabled
477 and the task is only allowed to execute a few safe syscalls
478 defined by each seccomp mode.
479
480 If unsure, say Y.
481
482endmenu
483
484menu "Power Management"
485
486config ARCH_HIBERNATION_POSSIBLE
487 def_bool y if 64BIT
488
489source "kernel/power/Kconfig"
490
491endmenu
492
493source "net/Kconfig"
494
495config PCMCIA
496 def_bool n
497
498config CCW
499 def_bool y
500
501source "drivers/Kconfig"
502
503source "fs/Kconfig"
504
505source "arch/s390/Kconfig.debug"
506
507source "security/Kconfig"
508
509source "crypto/Kconfig"
510
511source "lib/Kconfig"
512
513menu "Virtualization"
437 514
438config PFAULT 515config PFAULT
439 def_bool y 516 def_bool y
@@ -545,8 +622,6 @@ config APPLDATA_NET_SUM
545 This can also be compiled as a module, which will be called 622 This can also be compiled as a module, which will be called
546 appldata_net_sum.o. 623 appldata_net_sum.o.
547 624
548source kernel/Kconfig.hz
549
550config S390_HYPFS_FS 625config S390_HYPFS_FS
551 def_bool y 626 def_bool y
552 prompt "s390 hypervisor file system support" 627 prompt "s390 hypervisor file system support"
@@ -555,32 +630,7 @@ config S390_HYPFS_FS
555 This is a virtual file system intended to provide accounting 630 This is a virtual file system intended to provide accounting
556 information in an s390 hypervisor environment. 631 information in an s390 hypervisor environment.
557 632
558config KEXEC 633source "arch/s390/kvm/Kconfig"
559 def_bool n
560 prompt "kexec system call"
561 help
562 kexec is a system call that implements the ability to shutdown your
563 current kernel, and to start another kernel. It is like a reboot
564 but is independent of hardware/microcode support.
565
566config CRASH_DUMP
567 bool "kernel crash dumps"
568 depends on 64BIT && SMP
569 select KEXEC
570 help
571 Generate crash dump after being started by kexec.
572 Crash dump kernels are loaded in the main kernel with kexec-tools
573 into a specially reserved region and then later executed after
574 a crash by kdump/kexec.
575 For more details see Documentation/kdump/kdump.txt
576
577config ZFCPDUMP
578 def_bool n
579 prompt "zfcpdump support"
580 select SMP
581 help
582 Select this option if you want to build an zfcpdump enabled kernel.
583 Refer to <file:Documentation/s390/zfcpdump.txt> for more details on this.
584 634
585config S390_GUEST 635config S390_GUEST
586 def_bool y 636 def_bool y
@@ -596,49 +646,4 @@ config S390_GUEST
596 virtio transport. If KVM is detected, the virtio console will be 646 virtio transport. If KVM is detected, the virtio console will be
597 the default console. 647 the default console.
598 648
599config SECCOMP
600 def_bool y
601 prompt "Enable seccomp to safely compute untrusted bytecode"
602 depends on PROC_FS
603 help
604 This kernel feature is useful for number crunching applications
605 that may need to compute untrusted bytecode during their
606 execution. By using pipes or other transports made available to
607 the process as file descriptors supporting the read/write
608 syscalls, it's possible to isolate those applications in
609 their own address space using seccomp. Once seccomp is
610 enabled via /proc/<pid>/seccomp, it cannot be disabled
611 and the task is only allowed to execute a few safe syscalls
612 defined by each seccomp mode.
613
614 If unsure, say Y.
615
616endmenu
617
618menu "Power Management"
619
620source "kernel/power/Kconfig"
621
622endmenu 649endmenu
623
624source "net/Kconfig"
625
626config PCMCIA
627 def_bool n
628
629config CCW
630 def_bool y
631
632source "drivers/Kconfig"
633
634source "fs/Kconfig"
635
636source "arch/s390/Kconfig.debug"
637
638source "security/Kconfig"
639
640source "crypto/Kconfig"
641
642source "lib/Kconfig"
643
644source "arch/s390/kvm/Kconfig"
diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig
index 78eb9847008f..9b04a32e5695 100644
--- a/arch/s390/kvm/Kconfig
+++ b/arch/s390/kvm/Kconfig
@@ -5,7 +5,7 @@ source "virt/kvm/Kconfig"
5 5
6menuconfig VIRTUALIZATION 6menuconfig VIRTUALIZATION
7 def_bool y 7 def_bool y
8 prompt "Virtualization" 8 prompt "KVM"
9 ---help--- 9 ---help---
10 Say Y here to get to see options for using your Linux host to run other 10 Say Y here to get to see options for using your Linux host to run other
11 operating systems inside virtual machines (guests). 11 operating systems inside virtual machines (guests).
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-05 06:51:44 -0500