diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
commit | 919251758195919ae3568021bc221e4f8c4b20eb (patch) | |
tree | 81137a037ff8e6c91cc8de72d568275605c653c5 /arch/s390/Kconfig | |
parent | c394f1eafef61c6666f5876afde6110a276c4c9f (diff) | |
parent | 3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a (diff) |
Merge branch 'mainline' into upstream-linus
Diffstat (limited to 'arch/s390/Kconfig')
-rw-r--r-- | arch/s390/Kconfig | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 2f4f70c4dbb2..b216ca659cdf 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
@@ -460,8 +460,7 @@ config S390_HYPFS_FS | |||
460 | information in an s390 hypervisor environment. | 460 | information in an s390 hypervisor environment. |
461 | 461 | ||
462 | config KEXEC | 462 | config KEXEC |
463 | bool "kexec system call (EXPERIMENTAL)" | 463 | bool "kexec system call" |
464 | depends on EXPERIMENTAL | ||
465 | help | 464 | help |
466 | kexec is a system call that implements the ability to shutdown your | 465 | kexec is a system call that implements the ability to shutdown your |
467 | current kernel, and to start another kernel. It is like a reboot | 466 | current kernel, and to start another kernel. It is like a reboot |
@@ -487,8 +486,22 @@ source "drivers/net/Kconfig" | |||
487 | 486 | ||
488 | source "fs/Kconfig" | 487 | source "fs/Kconfig" |
489 | 488 | ||
489 | menu "Instrumentation Support" | ||
490 | |||
490 | source "arch/s390/oprofile/Kconfig" | 491 | source "arch/s390/oprofile/Kconfig" |
491 | 492 | ||
493 | config KPROBES | ||
494 | bool "Kprobes (EXPERIMENTAL)" | ||
495 | depends on EXPERIMENTAL && MODULES | ||
496 | help | ||
497 | Kprobes allows you to trap at almost any kernel address and | ||
498 | execute a callback function. register_kprobe() establishes | ||
499 | a probepoint and specifies the callback. Kprobes is useful | ||
500 | for kernel debugging, non-intrusive instrumentation and testing. | ||
501 | If in doubt, say "N". | ||
502 | |||
503 | endmenu | ||
504 | |||
492 | source "arch/s390/Kconfig.debug" | 505 | source "arch/s390/Kconfig.debug" |
493 | 506 | ||
494 | source "security/Kconfig" | 507 | source "security/Kconfig" |