Skip to content

Commit

Permalink
x86: Use generic time config
Browse files Browse the repository at this point in the history
Signed-off-by: Thomas Gleixner <[email protected]>
Signed-off-by: Anna-Maria Gleixner <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Cc: [email protected]
  • Loading branch information
KAGA-KOKO committed May 21, 2012
1 parent 22bc48f commit bdebaf8
Showing 1 changed file with 7 additions and 24 deletions.
31 changes: 7 additions & 24 deletions arch/x86/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit bdebaf8

Please sign in to comment.