[patch 17/24] s390: Use generic time config

Anna-Maria Gleixner
2012-05-18T17:17:17Z

[-- Attachment #1: s390-use-generic-time-config.patch --]
[-- Type: text/plain, Size: 1050 bytes --]

Signed-off-by: Anna-Maria Gleixner <anna-maria@glx-um.de>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
---
arch/s390/Kconfig | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)

Index: linux/arch/s390/Kconfig
===================================================================
--- linux.orig/arch/s390/Kconfig
+++ linux/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"