diff options
| author | John Stultz <johnstul@us.ibm.com> | 2010-07-13 20:56:20 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-07-27 06:40:54 -0400 |
| commit | 592913ecb87a9e06f98ddb55b298f1a66bf94c6b (patch) | |
| tree | 0f63f5535fe517faf418e0f7e69800fcf1e4d8db | |
| parent | ce3bf7ab22527183634a76512d9854a38615e4d5 (diff) | |
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: John Stultz <johnstul@us.ibm.com>
LKML-Reference: <1279068988-21864-4-git-send-email-johnstul@us.ibm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
33 files changed, 19 insertions, 159 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 2b2407d9a6d0..8abdfd7cb571 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -73,7 +73,6 @@ parameter is applicable: | |||
| 73 | MTD MTD (Memory Technology Device) support is enabled. | 73 | MTD MTD (Memory Technology Device) support is enabled. |
| 74 | NET Appropriate network support is enabled. | 74 | NET Appropriate network support is enabled. |
| 75 | NUMA NUMA support is enabled. | 75 | NUMA NUMA support is enabled. |
| 76 | GENERIC_TIME The generic timeofday code is enabled. | ||
| 77 | NFS Appropriate NFS support is enabled. | 76 | NFS Appropriate NFS support is enabled. |
| 78 | OSS OSS sound support is enabled. | 77 | OSS OSS sound support is enabled. |
| 79 | PV_OPS A paravirtualized kernel is enabled. | 78 | 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 | clocksource is not available, it defaults to PIT. | 467 | clocksource is not available, it defaults to PIT. |
| 469 | Format: { pit | tsc | cyclone | pmtmr } | 468 | Format: { pit | tsc | cyclone | pmtmr } |
| 470 | 469 | ||
| 471 | clocksource= [GENERIC_TIME] Override the default clocksource | 470 | clocksource= Override the default clocksource |
| 472 | Format: <string> | 471 | Format: <string> |
| 473 | Override the default clocksource and use the clocksource | 472 | Override the default clocksource and use the clocksource |
| 474 | with the name specified. | 473 | with the name specified. |
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 3e2e540a0f2a..b9647bb66d13 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig | |||
| @@ -47,10 +47,6 @@ config GENERIC_CALIBRATE_DELAY | |||
| 47 | bool | 47 | bool |
| 48 | default y | 48 | default y |
| 49 | 49 | ||
| 50 | config GENERIC_TIME | ||
| 51 | bool | ||
| 52 | default y | ||
| 53 | |||
| 54 | config GENERIC_CMOS_UPDATE | 50 | config GENERIC_CMOS_UPDATE |
| 55 | def_bool y | 51 | def_bool y |
| 56 | 52 | ||
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 98922f7d2d12..655b4ae76314 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -41,10 +41,6 @@ config SYS_SUPPORTS_APM_EMULATION | |||
| 41 | config GENERIC_GPIO | 41 | config GENERIC_GPIO |
| 42 | bool | 42 | bool |
| 43 | 43 | ||
| 44 | config GENERIC_TIME | ||
| 45 | bool | ||
| 46 | default y | ||
| 47 | |||
| 48 | config ARCH_USES_GETTIMEOFFSET | 44 | config ARCH_USES_GETTIMEOFFSET |
| 49 | bool | 45 | bool |
| 50 | default n | 46 | default n |
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index f2b319333184..f51572772e21 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig | |||
| @@ -45,9 +45,6 @@ config GENERIC_IRQ_PROBE | |||
| 45 | config RWSEM_GENERIC_SPINLOCK | 45 | config RWSEM_GENERIC_SPINLOCK |
| 46 | def_bool y | 46 | def_bool y |
| 47 | 47 | ||
| 48 | config GENERIC_TIME | ||
| 49 | def_bool y | ||
| 50 | |||
| 51 | config GENERIC_CLOCKEVENTS | 48 | config GENERIC_CLOCKEVENTS |
| 52 | def_bool y | 49 | def_bool y |
| 53 | 50 | ||
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index f66294b4f9d2..c88fd3584122 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
| @@ -614,9 +614,6 @@ comment "Kernel Timer/Scheduler" | |||
| 614 | 614 | ||
| 615 | source kernel/Kconfig.hz | 615 | source kernel/Kconfig.hz |
| 616 | 616 | ||
| 617 | config GENERIC_TIME | ||
| 618 | def_bool y | ||
| 619 | |||
| 620 | config GENERIC_CLOCKEVENTS | 617 | config GENERIC_CLOCKEVENTS |
| 621 | bool "Generic clock events" | 618 | bool "Generic clock events" |
| 622 | default y | 619 | default y |
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index e25bf4440b51..887ef855be2a 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig | |||
| @@ -20,9 +20,6 @@ config RWSEM_GENERIC_SPINLOCK | |||
| 20 | config RWSEM_XCHGADD_ALGORITHM | 20 | config RWSEM_XCHGADD_ALGORITHM |
| 21 | bool | 21 | bool |
| 22 | 22 | ||
| 23 | config GENERIC_TIME | ||
| 24 | def_bool y | ||
| 25 | |||
| 26 | config GENERIC_CMOS_UPDATE | 23 | config GENERIC_CMOS_UPDATE |
| 27 | def_bool y | 24 | def_bool y |
| 28 | 25 | ||
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig index 4b5830bcbe2e..16399bd24993 100644 --- a/arch/frv/Kconfig +++ b/arch/frv/Kconfig | |||
| @@ -40,10 +40,6 @@ config GENERIC_HARDIRQS_NO__DO_IRQ | |||
| 40 | bool | 40 | bool |
| 41 | default y | 41 | default y |
| 42 | 42 | ||
| 43 | config GENERIC_TIME | ||
| 44 | bool | ||
| 45 | default y | ||
| 46 | |||
| 47 | config TIME_LOW_RES | 43 | config TIME_LOW_RES |
| 48 | bool | 44 | bool |
| 49 | default y | 45 | default y |
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig index 53cc669e6d59..988b6ff34cc4 100644 --- a/arch/h8300/Kconfig +++ b/arch/h8300/Kconfig | |||
| @@ -62,10 +62,6 @@ config GENERIC_CALIBRATE_DELAY | |||
| 62 | bool | 62 | bool |
| 63 | default y | 63 | default y |
| 64 | 64 | ||
| 65 | config GENERIC_TIME | ||
| 66 | bool | ||
| 67 | default y | ||
| 68 | |||
| 69 | config GENERIC_BUG | 65 | config GENERIC_BUG |
| 70 | bool | 66 | bool |
| 71 | depends on BUG | 67 | depends on BUG |
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 95610820041e..8711d13cd79f 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -82,10 +82,6 @@ config GENERIC_CALIBRATE_DELAY | |||
| 82 | bool | 82 | bool |
| 83 | default y | 83 | default y |
| 84 | 84 | ||
| 85 | config GENERIC_TIME | ||
| 86 | bool | ||
| 87 | default y | ||
| 88 | |||
| 89 | config GENERIC_TIME_VSYSCALL | 85 | config GENERIC_TIME_VSYSCALL |
| 90 | bool | 86 | bool |
| 91 | default y | 87 | default y |
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index 3a9319f93e89..836abbbc9c04 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig | |||
| @@ -44,9 +44,6 @@ config HZ | |||
| 44 | int | 44 | int |
| 45 | default 100 | 45 | default 100 |
| 46 | 46 | ||
| 47 | config GENERIC_TIME | ||
| 48 | def_bool y | ||
| 49 | |||
| 50 | config ARCH_USES_GETTIMEOFFSET | 47 | config ARCH_USES_GETTIMEOFFSET |
| 51 | def_bool y | ||
