diff options
| author | Anna-Maria Gleixner <anna-maria@glx-um.de> | 2012-05-18 16:45:52 +0000 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-21 11:01:43 +0200 |
| commit | a6527b92e40f48b29c31be911c3d62eec484cf70 (patch) | |
| tree | 1c6a24623c147feb164ce8110ec6fb998edb9d55 /arch/s390 | |
| parent | 5bf8f6bfc950abe23927e0ff54cdb260d19d608e (diff) | |
| download | talos-obmc-linux-a6527b92e40f48b29c31be911c3d62eec484cf70.tar.gz talos-obmc-linux-a6527b92e40f48b29c31be911c3d62eec484cf70.zip | |
s390: Use generic time config
Signed-off-by: Anna-Maria Gleixner <anna-maria@glx-um.de>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Link: http://lkml.kernel.org/r/20120518163106.595607369@glx-um.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/Kconfig | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 9015060919a0..f9edb9303a7e 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" |
