diff options
Diffstat (limited to 'arch/s390/Kconfig')
-rw-r--r-- | arch/s390/Kconfig | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 8116a3328a19..8152fefc97b9 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
@@ -43,6 +43,9 @@ config GENERIC_HWEIGHT | |||
43 | config GENERIC_TIME | 43 | config GENERIC_TIME |
44 | def_bool y | 44 | def_bool y |
45 | 45 | ||
46 | config GENERIC_TIME_VSYSCALL | ||
47 | def_bool y | ||
48 | |||
46 | config GENERIC_CLOCKEVENTS | 49 | config GENERIC_CLOCKEVENTS |
47 | def_bool y | 50 | def_bool y |
48 | 51 | ||
@@ -66,10 +69,15 @@ config PGSTE | |||
66 | bool | 69 | bool |
67 | default y if KVM | 70 | default y if KVM |
68 | 71 | ||
72 | config VIRT_CPU_ACCOUNTING | ||
73 | def_bool y | ||
74 | |||
69 | mainmenu "Linux Kernel Configuration" | 75 | mainmenu "Linux Kernel Configuration" |
70 | 76 | ||
71 | config S390 | 77 | config S390 |
72 | def_bool y | 78 | def_bool y |
79 | select USE_GENERIC_SMP_HELPERS if SMP | ||
80 | select HAVE_FUNCTION_TRACER | ||
73 | select HAVE_OPROFILE | 81 | select HAVE_OPROFILE |
74 | select HAVE_KPROBES | 82 | select HAVE_KPROBES |
75 | select HAVE_KRETPROBES | 83 | select HAVE_KRETPROBES |
@@ -225,6 +233,14 @@ config MARCH_Z9_109 | |||
225 | Class (z9 BC). The kernel will be slightly faster but will not | 233 | Class (z9 BC). The kernel will be slightly faster but will not |
226 | work on older machines such as the z990, z890, z900, and z800. | 234 | work on older machines such as the z990, z890, z900, and z800. |
227 | 235 | ||
236 | config MARCH_Z10 | ||
237 | bool "IBM System z10" | ||
238 | help | ||
239 | Select this to enable optimizations for IBM System z10. The | ||
240 | kernel will be slightly faster but will not work on older | ||
241 | machines such as the z990, z890, z900, z800, z9-109, z9-ec | ||
242 | and z9-bc. | ||
243 | |||
228 | endchoice | 244 | endchoice |
229 | 245 | ||
230 | config PACK_STACK | 246 | config PACK_STACK |
@@ -343,16 +359,6 @@ config QDIO | |||
343 | 359 | ||
344 | If unsure, say Y. | 360 | If unsure, say Y. |
345 | 361 | ||
346 | config QDIO_DEBUG | ||
347 | bool "Extended debugging information" | ||
348 | depends on QDIO | ||
349 | help | ||
350 | Say Y here to get extended debugging output in | ||
351 | /sys/kernel/debug/s390dbf/qdio... | ||
352 | Warning: this option reduces the performance of the QDIO module. | ||
353 | |||
354 | If unsure, say N. | ||
355 | |||
356 | config CHSC_SCH | 362 | config CHSC_SCH |
357 | tristate "Support for CHSC subchannels" | 363 | tristate "Support for CHSC subchannels" |
358 | help | 364 | help |
@@ -466,22 +472,9 @@ config PAGE_STATES | |||
466 | hypervisor. The ESSA instruction is used to do the states | 472 | hypervisor. The ESSA instruction is used to do the states |
467 | changes between a page that has content and the unused state. | 473 | changes between a page that has content and the unused state. |
468 | 474 | ||
469 | config VIRT_TIMER | ||
470 | bool "Virtual CPU timer support" | ||
471 | help | ||
472 | This provides a kernel interface for virtual CPU timers. | ||
473 | Default is disabled. | ||
474 | |||
475 | config VIRT_CPU_ACCOUNTING | ||
476 | bool "Base user process accounting on virtual cpu timer" | ||
477 | depends on VIRT_TIMER | ||
478 | help | ||
479 | Select this option to use CPU timer deltas to do user | ||
480 | process accounting. | ||
481 | |||
482 | config APPLDATA_BASE | 475 | config APPLDATA_BASE |
483 | bool "Linux - VM Monitor Stream, base infrastructure" | 476 | bool "Linux - VM Monitor Stream, base infrastructure" |
484 | depends on PROC_FS && VIRT_TIMER=y | 477 | depends on PROC_FS |
485 | help | 478 | help |
486 | This provides a kernel interface for creating and updating z/VM APPLDATA | 479 | This provides a kernel interface for creating and updating z/VM APPLDATA |
487 | monitor records. The monitor records are updated at certain time | 480 | monitor records. The monitor records are updated at certain time |