From: tip-bot for Anna-Maria Gleixner <anna-maria@glx-um.de>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
schwidefsky@de.ibm.com, tglx@linutronix.de, anna-maria@glx-um.de
Subject: [tip:timers/core] s390: Use generic time config
Date: Mon, 21 May 2012 02:21:11 -0700 [thread overview]
Message-ID: <tip-a6527b92e40f48b29c31be911c3d62eec484cf70@git.kernel.org> (raw)
In-Reply-To: <20120518163106.595607369@glx-um.de>
Commit-ID: a6527b92e40f48b29c31be911c3d62eec484cf70
Gitweb: http://git.kernel.org/tip/a6527b92e40f48b29c31be911c3d62eec484cf70
Author: Anna-Maria Gleixner <anna-maria@glx-um.de>
AuthorDate: Fri, 18 May 2012 16:45:52 +0000
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Mon, 21 May 2012 11:01:43 +0200
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>
---
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"
next prev parent reply other threads:[~2012-05-21 9:21 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-18 16:45 [patch 00/24] timers: Cleanup Kconfig Anna-Maria Gleixner
2012-05-18 16:45 ` [patch 01/24] timers: Provide generic Kconfig switches Anna-Maria Gleixner
2012-05-18 23:14 ` Paul Mundt
2012-05-20 15:59 ` Anna-Maria Gleixner
2012-05-20 16:03 ` Thomas Gleixner
2012-05-21 9:07 ` [tip:timers/core] " tip-bot for Thomas Gleixner
2012-05-18 16:45 ` [patch 03/24] arm: Use generic time config Anna-Maria Gleixner
2012-05-21 9:09 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2012-05-18 16:45 ` [patch 02/24] x86: " Anna-Maria Gleixner
2012-05-21 9:27 ` [tip:timers/core] " tip-bot for Thomas Gleixner
2012-05-18 16:45 ` [patch 04/24] avr32: " Anna-Maria Gleixner
2012-05-21 9:10 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2012-05-18 16:45 ` [patch 05/24] blackfin: " Anna-Maria Gleixner
2012-05-21 9:11 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2012-05-18 16:45 ` [patch 07/24] cris: " Anna-Maria Gleixner
2012-05-21 9:12 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2012-05-18 16:45 ` [patch 06/24] c6x: " Anna-Maria Gleixner
2012-05-18 17:42 ` Mark Salter
2012-05-21 9:11 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2012-05-18 16:45 ` [patch 08/24] hexagon: " Anna-Maria Gleixner
2012-05-21 9:13 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2012-05-18 16:45 ` [patch 09/24] ia64: " Anna-Maria Gleixner
2012-05-21 9:14 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2012-05-18 16:45 ` [patch 10/24] m32r: " Anna-Maria Gleixner
2012-05-21 9:15 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2012-05-18 16:45 ` [patch 11/24] m68k: " Anna-Maria Gleixner
2012-05-21 9:16 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2012-05-18 16:45 ` [patch 12/24] microblaze: " Anna-Maria Gleixner
2012-05-21 9:16 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2012-05-18 16:45 ` [patch 14/24] mn10300: " Anna-Maria Gleixner
2012-05-21 9:18 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2012-05-18 16:45 ` [patch 13/24] mips: " Anna-Maria Gleixner
2012-05-21 9:17 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2012-05-18 16:45 ` [patch 16/24] powerpc: " Anna-Maria Gleixner
2012-05-21 9:19 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2012-05-18 16:45 ` [patch 15/24] openrisc: " Anna-Maria Gleixner
2012-05-18 19:56 ` Jonas Bonn
2012-05-21 9:20 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2012-05-18 16:45 ` [patch 17/24] s390: " Anna-Maria Gleixner
2012-05-21 9:21 ` tip-bot for Anna-Maria Gleixner [this message]
2012-05-18 16:45 ` [patch 18/24] score: " Anna-Maria Gleixner
2012-05-21 9:22 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2012-05-18 16:45 ` [patch 19/24] sh: " Anna-Maria Gleixner
2012-05-21 9:22 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2012-05-18 16:45 ` [patch 21/24] tile: " Anna-Maria Gleixner
2012-05-21 9:24 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2012-05-18 16:45 ` [patch 20/24] sparc: Use: " Anna-Maria Gleixner
2012-05-18 17:50 ` Sam Ravnborg
2012-05-18 17:53 ` David Miller
2012-05-18 18:52 ` Sam Ravnborg
2012-05-20 16:52 ` Sam Ravnborg
2012-05-21 9:23 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2012-05-18 16:45 ` [patch 22/24] um: Use " Anna-Maria Gleixner
2012-05-18 17:19 ` Richard Weinberger
2012-05-21 9:25 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2012-05-18 16:45 ` [patch 23/24] unicore32: " Anna-Maria Gleixner
2012-05-21 9:26 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2012-05-21 9:40 ` [patch 23/24] " guanxuetao
2012-05-18 16:45 ` [patch 24/24] alpha: " Anna-Maria Gleixner
2012-05-18 17:06 ` Matt Turner
2012-05-21 9:08 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-a6527b92e40f48b29c31be911c3d62eec484cf70@git.kernel.org \
--to=anna-maria@glx-um.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=schwidefsky@de.ibm.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).