Commit-ID: a6527b92e40f48b29c31be911c3d62eec484cf70 Gitweb: http://git.kernel.org/tip/a6527b92e40f48b29c31be911c3d62eec484cf70 Author: Anna-Maria Gleixner <anna-maria@xxxxxxxxx> AuthorDate: Fri, 18 May 2012 16:45:52 +0000 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitDate: Mon, 21 May 2012 11:01:43 +0200 s390: Use generic time config Signed-off-by: Anna-Maria Gleixner <anna-maria@xxxxxxxxx> Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Link: http://lkml.kernel.org/r/20120518163106.595607369@xxxxxxxxx Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> --- arch/s390/Kconfig | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 9015060..f9edb93 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -28,12 +28,6 @@ config ARCH_HAS_ILOG2_U64 config GENERIC_HWEIGHT def_bool y -config GENERIC_TIME_VSYSCALL - def_bool y - -config GENERIC_CLOCKEVENTS - def_bool y - config GENERIC_BUG def_bool y if BUG @@ -122,6 +116,9 @@ config S390 select ARCH_INLINE_WRITE_UNLOCK_BH select ARCH_INLINE_WRITE_UNLOCK_IRQ select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE + select GENERIC_TIME_VSYSCALL + select GENERIC_CLOCKEVENTS + select KTIME_SCALAR if 32BIT config SCHED_OMIT_FRAME_POINTER def_bool y @@ -146,9 +143,6 @@ config 64BIT config 32BIT def_bool y if !64BIT -config KTIME_SCALAR - def_bool 32BIT - config SMP def_bool y prompt "Symmetric multi-processing support" -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|