diff options
| author | John Stultz <johnstul@us.ibm.com> | 2010-07-13 17:56:20 -0700 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-07-27 12:40:54 +0200 |
| commit | 592913ecb87a9e06f98ddb55b298f1a66bf94c6b (patch) | |
| tree | 0f63f5535fe517faf418e0f7e69800fcf1e4d8db /kernel/time/clocksource.c | |
| parent | ce3bf7ab22527183634a76512d9854a38615e4d5 (diff) | |
| download | linux-592913ecb87a9e06f98ddb55b298f1a66bf94c6b.tar.gz linux-592913ecb87a9e06f98ddb55b298f1a66bf94c6b.tar.bz2 linux-592913ecb87a9e06f98ddb55b298f1a66bf94c6b.zip | |
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>
Diffstat (limited to 'kernel/time/clocksource.c')
| -rw-r--r-- | kernel/time/clocksource.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index f08e99c1d561..c543d21b4e54 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c @@ -531,7 +531,7 @@ static u64 clocksource_max_deferment(struct clocksource *cs) return max_nsecs - (max_nsecs >> 5); } -#ifdef CONFIG_GENERIC_TIME +#ifndef CONFIG_ARCH_USES_GETTIMEOFFSET /** * clocksource_select - Select the best clocksource available @@ -577,7 +577,7 @@ static void clocksource_select(void) } } -#else /* CONFIG_GENERIC_TIME */ +#else /* !CONFIG_ARCH_USES_GETTIMEOFFSET */ static inline void clocksource_select(void) { } |