diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-12-12 10:46:15 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-12-12 10:46:15 +0100 |
| commit | 8494bd0e86271fb21581d27e3c5d6a369b5208ca (patch) | |
| tree | 65572b9ad90b016f8fcb7e1964f8536c7dc588f9 /arch/s390/Kconfig | |
| parent | Merge tag 'kvm-s390-20131128' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | x86, xsave: Support eager-only xsave features, add MPX support (diff) | |
| download | linux-8494bd0e86271fb21581d27e3c5d6a369b5208ca.tar.xz linux-8494bd0e86271fb21581d27e3c5d6a369b5208ca.zip | |
Merge remote-tracking branch 'tip/x86/cpufeature' into kvm-next
Diffstat (limited to 'arch/s390/Kconfig')
| -rw-r--r-- | arch/s390/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 314fced4fc14..5877e71901b3 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -101,7 +101,7 @@ config S390 select GENERIC_CPU_DEVICES if !SMP select GENERIC_FIND_FIRST_BIT select GENERIC_SMP_IDLE_THREAD - select GENERIC_TIME_VSYSCALL_OLD + select GENERIC_TIME_VSYSCALL select HAVE_ALIGNED_STRUCT_PAGE if SLUB select HAVE_ARCH_JUMP_LABEL if !MARCH_G5 select HAVE_ARCH_SECCOMP_FILTER |