diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-09-04 08:31:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-09-04 08:31:00 -0400 |
| commit | 59f979455d7209171ab10a72c8df5c2512976cb4 (patch) | |
| tree | c4c7fc48bd79bf8acbe848a1b979fa9e8ab4ac6a /arch/s390/Kconfig | |
| parent | b9bb50db9126c4ccad78af2dfb77277ca17c9b64 (diff) | |
| parent | 9450d57eab5cad36774c297da123062744472588 (diff) | |
Merge branch 'sched/urgent' into sched/core
Merge in the current fixes branch, we are going to apply dependent patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390/Kconfig')
| -rw-r--r-- | arch/s390/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 49ebfb62c86a..f5ab543396da 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
| @@ -123,6 +123,7 @@ config S390 | |||
| 123 | select GENERIC_TIME_VSYSCALL | 123 | select GENERIC_TIME_VSYSCALL |
| 124 | select GENERIC_CLOCKEVENTS | 124 | select GENERIC_CLOCKEVENTS |
| 125 | select KTIME_SCALAR if 32BIT | 125 | select KTIME_SCALAR if 32BIT |
| 126 | select HAVE_ARCH_SECCOMP_FILTER | ||
| 126 | 127 | ||
| 127 | config SCHED_OMIT_FRAME_POINTER | 128 | config SCHED_OMIT_FRAME_POINTER |
| 128 | def_bool y | 129 | def_bool y |