diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
| commit | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (patch) | |
| tree | 9a82f4b7f2c3afe4b0208d8e44ea61bae90a7d22 /arch/s390/Kconfig | |
| parent | 5e226e4d9016daee170699f8a4188a5505021756 (diff) | |
| parent | bde4f8fa8db2abd5ac9c542d76012d0fedab050f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/s390/Kconfig')
| -rw-r--r-- | arch/s390/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index b21444b681b6..1831833c430e 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
| @@ -61,6 +61,7 @@ config S390 | |||
| 61 | def_bool y | 61 | def_bool y |
| 62 | select HAVE_OPROFILE | 62 | select HAVE_OPROFILE |
| 63 | select HAVE_KPROBES | 63 | select HAVE_KPROBES |
| 64 | select HAVE_KRETPROBES | ||
| 64 | 65 | ||
| 65 | source "init/Kconfig" | 66 | source "init/Kconfig" |
| 66 | 67 | ||
| @@ -350,6 +351,10 @@ endchoice | |||
| 350 | 351 | ||
| 351 | source "fs/Kconfig.binfmt" | 352 | source "fs/Kconfig.binfmt" |
| 352 | 353 | ||
| 354 | config FORCE_MAX_ZONEORDER | ||
| 355 | int | ||
| 356 | default "9" | ||
| 357 | |||
| 353 | config PROCESS_DEBUG | 358 | config PROCESS_DEBUG |
| 354 | bool "Show crashed user process info" | 359 | bool "Show crashed user process info" |
| 355 | help | 360 | help |