Skip to content
Snippets Groups Projects
Commit 592913ec authored by John Stultz's avatar John Stultz Committed by Thomas Gleixner
Browse files

time: Kill off CONFIG_GENERIC_TIME


Now that all arches have been converted over to use generic time via
clocksources or arch_gettimeoffset(), we can remove the GENERIC_TIME
config option and simplify the generic code.

Signed-off-by: default avatarJohn Stultz <johnstul@us.ibm.com>
LKML-Reference: <1279068988-21864-4-git-send-email-johnstul@us.ibm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent ce3bf7ab
Branches
Tags
No related merge requests found
Showing with 1 addition and 67 deletions
...@@ -73,7 +73,6 @@ parameter is applicable: ...@@ -73,7 +73,6 @@ parameter is applicable:
MTD MTD (Memory Technology Device) support is enabled. MTD MTD (Memory Technology Device) support is enabled.
NET Appropriate network support is enabled. NET Appropriate network support is enabled.
NUMA NUMA support is enabled. NUMA NUMA support is enabled.
GENERIC_TIME The generic timeofday code is enabled.
NFS Appropriate NFS support is enabled. NFS Appropriate NFS support is enabled.
OSS OSS sound support is enabled. OSS OSS sound support is enabled.
PV_OPS A paravirtualized kernel is enabled. PV_OPS A paravirtualized kernel is enabled.
...@@ -468,7 +467,7 @@ and is between 256 and 4096 characters. It is defined in the file ...@@ -468,7 +467,7 @@ and is between 256 and 4096 characters. It is defined in the file
clocksource is not available, it defaults to PIT. clocksource is not available, it defaults to PIT.
Format: { pit | tsc | cyclone | pmtmr } Format: { pit | tsc | cyclone | pmtmr }
clocksource= [GENERIC_TIME] Override the default clocksource clocksource= Override the default clocksource
Format: <string> Format: <string>
Override the default clocksource and use the clocksource Override the default clocksource and use the clocksource
with the name specified. with the name specified.
......
...@@ -47,10 +47,6 @@ config GENERIC_CALIBRATE_DELAY ...@@ -47,10 +47,6 @@ config GENERIC_CALIBRATE_DELAY
bool bool
default y default y
config GENERIC_TIME
bool
default y
config GENERIC_CMOS_UPDATE config GENERIC_CMOS_UPDATE
def_bool y def_bool y
......
...@@ -41,10 +41,6 @@ config SYS_SUPPORTS_APM_EMULATION ...@@ -41,10 +41,6 @@ config SYS_SUPPORTS_APM_EMULATION
config GENERIC_GPIO config GENERIC_GPIO
bool bool
config GENERIC_TIME
bool
default y
config ARCH_USES_GETTIMEOFFSET config ARCH_USES_GETTIMEOFFSET
bool bool
default n default n
......
...@@ -45,9 +45,6 @@ config GENERIC_IRQ_PROBE ...@@ -45,9 +45,6 @@ config GENERIC_IRQ_PROBE
config RWSEM_GENERIC_SPINLOCK config RWSEM_GENERIC_SPINLOCK
def_bool y def_bool y
config GENERIC_TIME
def_bool y
config GENERIC_CLOCKEVENTS config GENERIC_CLOCKEVENTS
def_bool y def_bool y
......
...@@ -614,9 +614,6 @@ comment "Kernel Timer/Scheduler" ...@@ -614,9 +614,6 @@ comment "Kernel Timer/Scheduler"
source kernel/Kconfig.hz source kernel/Kconfig.hz
config GENERIC_TIME
def_bool y
config GENERIC_CLOCKEVENTS config GENERIC_CLOCKEVENTS
bool "Generic clock events" bool "Generic clock events"
default y default y
......
...@@ -20,9 +20,6 @@ config RWSEM_GENERIC_SPINLOCK ...@@ -20,9 +20,6 @@ config RWSEM_GENERIC_SPINLOCK
config RWSEM_XCHGADD_ALGORITHM config RWSEM_XCHGADD_ALGORITHM
bool bool
config GENERIC_TIME
def_bool y
config GENERIC_CMOS_UPDATE config GENERIC_CMOS_UPDATE
def_bool y def_bool y
......
...@@ -40,10 +40,6 @@ config GENERIC_HARDIRQS_NO__DO_IRQ ...@@ -40,10 +40,6 @@ config GENERIC_HARDIRQS_NO__DO_IRQ
bool bool
default y default y
config GENERIC_TIME
bool
default y
config TIME_LOW_RES config TIME_LOW_RES
bool bool
default y default y
......
...@@ -62,10 +62,6 @@ config GENERIC_CALIBRATE_DELAY ...@@ -62,10 +62,6 @@ config GENERIC_CALIBRATE_DELAY
bool bool
default y default y
config GENERIC_TIME
bool
default y
config GENERIC_BUG config GENERIC_BUG
bool bool
depends on BUG depends on BUG
......
...@@ -82,10 +82,6 @@ config GENERIC_CALIBRATE_DELAY ...@@ -82,10 +82,6 @@ config GENERIC_CALIBRATE_DELAY
bool bool
default y default y
config GENERIC_TIME
bool
default y
config GENERIC_TIME_VSYSCALL config GENERIC_TIME_VSYSCALL
bool bool
default y default y
......
...@@ -44,9 +44,6 @@ config HZ ...@@ -44,9 +44,6 @@ config HZ
int int
default 100 default 100
config GENERIC_TIME
def_bool y
config ARCH_USES_GETTIMEOFFSET config ARCH_USES_GETTIMEOFFSET
def_bool y def_bool y
......
...@@ -59,9 +59,6 @@ config HZ ...@@ -59,9 +59,6 @@ config HZ
int int
default 100 default 100
config GENERIC_TIME
def_bool y
config ARCH_USES_GETTIMEOFFSET config ARCH_USES_GETTIMEOFFSET
def_bool y def_bool y
......
...@@ -63,10 +63,6 @@ config GENERIC_CALIBRATE_DELAY ...@@ -63,10 +63,6 @@ config GENERIC_CALIBRATE_DELAY
bool bool
default y default y
config GENERIC_TIME
bool
default y
config GENERIC_CMOS_UPDATE config GENERIC_CMOS_UPDATE
bool bool
default y default y
......
...@@ -48,9 +48,6 @@ config GENERIC_IRQ_PROBE ...@@ -48,9 +48,6 @@ config GENERIC_IRQ_PROBE
config GENERIC_CALIBRATE_DELAY config GENERIC_CALIBRATE_DELAY
def_bool y def_bool y
config GENERIC_TIME
def_bool y
config GENERIC_TIME_VSYSCALL config GENERIC_TIME_VSYSCALL
def_bool n def_bool n
......
...@@ -733,10 +733,6 @@ config GENERIC_CLOCKEVENTS ...@@ -733,10 +733,6 @@ config GENERIC_CLOCKEVENTS
bool bool
default y default y
config GENERIC_TIME
bool
default y
config GENERIC_CMOS_UPDATE config GENERIC_CMOS_UPDATE
bool bool
default y default y
......
...@@ -46,9 +46,6 @@ config GENERIC_FIND_NEXT_BIT ...@@ -46,9 +46,6 @@ config GENERIC_FIND_NEXT_BIT
config GENERIC_HWEIGHT config GENERIC_HWEIGHT
def_bool y def_bool y
config GENERIC_TIME
def_bool y
config GENERIC_BUG config GENERIC_BUG
def_bool y def_bool y
......
...@@ -66,10 +66,6 @@ config GENERIC_CALIBRATE_DELAY ...@@ -66,10 +66,6 @@ config GENERIC_CALIBRATE_DELAY
bool bool
default y default y
config GENERIC_TIME
bool
default y
config TIME_LOW_RES config TIME_LOW_RES
bool bool
depends on SMP depends on SMP
......
...@@ -29,9 +29,6 @@ config MMU ...@@ -29,9 +29,6 @@ config MMU
config GENERIC_CMOS_UPDATE config GENERIC_CMOS_UPDATE
def_bool y def_bool y
config GENERIC_TIME
def_bool y
config GENERIC_TIME_VSYSCALL config GENERIC_TIME_VSYSCALL
def_bool y def_bool y
......
...@@ -40,9 +40,6 @@ config ARCH_HAS_ILOG2_U64 ...@@ -40,9 +40,6 @@ config ARCH_HAS_ILOG2_U64
config GENERIC_HWEIGHT config GENERIC_HWEIGHT
def_bool y def_bool y
config GENERIC_TIME
def_bool y
config GENERIC_TIME_VSYSCALL config GENERIC_TIME_VSYSCALL
def_bool y def_bool y
......
...@@ -55,9 +55,6 @@ config GENERIC_CALIBRATE_DELAY ...@@ -55,9 +55,6 @@ config GENERIC_CALIBRATE_DELAY
config GENERIC_CLOCKEVENTS config GENERIC_CLOCKEVENTS
def_bool y def_bool y
config GENERIC_TIME
def_bool y
config SCHED_NO_NO_OMIT_FRAME_POINTER config SCHED_NO_NO_OMIT_FRAME_POINTER
def_bool y def_bool y
......
...@@ -98,9 +98,6 @@ config GENERIC_CALIBRATE_DELAY ...@@ -98,9 +98,6 @@ config GENERIC_CALIBRATE_DELAY
config GENERIC_IOMAP config GENERIC_IOMAP
bool bool
config GENERIC_TIME
def_bool y
config GENERIC_CLOCKEVENTS config GENERIC_CLOCKEVENTS
def_bool y def_bool y
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment