diff options
| author | Ingo Molnar | 2012-09-04 14:31:00 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2012-09-04 14:31:00 +0200 |
| commit | 59f979455d7209171ab10a72c8df5c2512976cb4 (patch) | |
| tree | c4c7fc48bd79bf8acbe848a1b979fa9e8ab4ac6a /arch/s390/Kconfig | |
| parent | s390: Remove leftover account_tick_vtime() header (diff) | |
| parent | sched: Fix kernel-doc warnings in kernel/sched/fair.c (diff) | |
| download | kernel-qcow2-linux-59f979455d7209171ab10a72c8df5c2512976cb4.tar.gz kernel-qcow2-linux-59f979455d7209171ab10a72c8df5c2512976cb4.tar.xz kernel-qcow2-linux-59f979455d7209171ab10a72c8df5c2512976cb4.zip | |
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 select GENERIC_TIME_VSYSCALL select GENERIC_CLOCKEVENTS select KTIME_SCALAR if 32BIT + select HAVE_ARCH_SECCOMP_FILTER config SCHED_OMIT_FRAME_POINTER def_bool y |