From: tip-bot for Thomas Gleixner <tglx@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
tglx@linutronix.de, anna-maria@glx-um.de
Subject: [tip:timers/core] x86: Use generic time config
Date: Mon, 21 May 2012 02:27:04 -0700 [thread overview]
Message-ID: <tip-bdebaf80a02b854381fe212e0dac13c8c8edac57@git.kernel.org> (raw)
In-Reply-To: <20120518163104.630579708@glx-um.de>
Commit-ID: bdebaf80a02b854381fe212e0dac13c8c8edac57
Gitweb: http://git.kernel.org/tip/bdebaf80a02b854381fe212e0dac13c8c8edac57
Author: Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Fri, 18 May 2012 16:45:44 +0000
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Mon, 21 May 2012 11:01:44 +0200
x86: Use generic time config
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Anna-Maria Gleixner <anna-maria@glx-um.de>
Link: http://lkml.kernel.org/r/20120518163104.630579708@glx-um.de
Cc: x86@kernel.org
---
arch/x86/Kconfig | 31 +++++++------------------------
1 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index c9866b0..3b0a921 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -82,6 +82,13 @@ config X86
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select GENERIC_IOMAP
select DCACHE_WORD_ACCESS
+ select GENERIC_CMOS_UPDATE
+ select CLOCKSOURCE_WATCHDOG
+ select GENERIC_CLOCKEVENTS
+ select ARCH_CLOCKSOURCE_DATA if X86_64
+ select GENERIC_CLOCKEVENTS_BROADCAST if X86_64 || (X86_32 && X86_LOCAL_APIC)
+ select GENERIC_TIME_VSYSCALL if X86_64
+ select KTIME_SCALAR if X86_32
config INSTRUCTION_DECODER
def_bool (KPROBES || PERF_EVENTS)
@@ -96,23 +103,6 @@ config ARCH_DEFCONFIG
default "arch/x86/configs/i386_defconfig" if X86_32
default "arch/x86/configs/x86_64_defconfig" if X86_64
-config GENERIC_CMOS_UPDATE
- def_bool y
-
-config CLOCKSOURCE_WATCHDOG
- def_bool y
-
-config GENERIC_CLOCKEVENTS
- def_bool y
-
-config ARCH_CLOCKSOURCE_DATA
- def_bool y
- depends on X86_64
-
-config GENERIC_CLOCKEVENTS_BROADCAST
- def_bool y
- depends on X86_64 || (X86_32 && X86_LOCAL_APIC)
-
config LOCKDEP_SUPPORT
def_bool y
@@ -166,10 +156,6 @@ config ARCH_HAS_CPU_IDLE_WAIT
config GENERIC_CALIBRATE_DELAY
def_bool y
-config GENERIC_TIME_VSYSCALL
- bool
- default X86_64
-
config ARCH_HAS_CPU_RELAX
def_bool y
@@ -236,9 +222,6 @@ config ARCH_HWEIGHT_CFLAGS
default "-fcall-saved-ecx -fcall-saved-edx" if X86_32
default "-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" if X86_64
-config KTIME_SCALAR
- def_bool X86_32
-
config ARCH_CPU_PROBE_RELEASE
def_bool y
depends on HOTPLUG_CPU
next prev parent reply other threads:[~2012-05-21 9:27 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-bot for Thomas Gleixner [this message]
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:timers/core] " tip-bot for Anna-Maria Gleixner
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-bdebaf80a02b854381fe212e0dac13c8c8edac57@git.kernel.org \
--to=tglx@linutronix.de \
--cc=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 \
/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).