sh: Don't enable GENERIC_TIME for the CMT clockevent driver yet.

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

GENERIC_TIME still depends on the clocksource bits being there, which is
presently not supported. This allows the CMT clockevent driver to be used
alongside alternate system timers that do not yet provide a clocksource
of their own (MTU2 and so on in the case of SH-2A).

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

Paul Mundt 17 years ago c161e40f d63f3a58

-3

2 changed files

expand all

arch

Kconfig

kernel

time_32.c

-1

arch/sh/Kconfig

··· 431 431 config SH_TIMER_CMT 432 432 bool "CMT clockevents driver" 433 433 depends on SYS_SUPPORTS_CMT && !SH_CMT 434 - select GENERIC_TIME 435 434 select GENERIC_CLOCKEVENTS 436 435 437 436 config SH_MTU2

-2

arch/sh/kernel/time_32.c

··· 104 104 EXPORT_SYMBOL(do_settimeofday); 105 105 #endif /* !CONFIG_GENERIC_TIME */ 106 106 107 - #ifndef CONFIG_GENERIC_CLOCKEVENTS 108 107 /* last time the RTC clock got updated */ 109 108 static long last_rtc_update; 110 109 ··· 147 148 update_process_times(user_mode(get_irq_regs())); 148 149 #endif 149 150 } 150 - #endif /* !CONFIG_GENERIC_CLOCKEVENTS */ 151 151 152 152 #ifdef CONFIG_PM 153 153 int timer_suspend(struct sys_device *dev, pm_message_t state)