Message ID | 1433236477-1724-4-git-send-email-xlpang@126.com |
---|---|
State | Superseded |
Headers | show |
On 02/06/2015 at 17:14:37 +0800, Xunlei Pang wrote : > From: Xunlei Pang <pang.xunlei@linaro.org> > > - Remove update_persistent_clock(), as it does nothing now. > - Remove read_persistent_clock(), let it fall back to the weak version. > > Signed-off-by: Xunlei Pang <pang.xunlei@linaro.org> That patch doesn't seem to have any dependencies, it should go through the cris maintainers tree: Mikael Starvik <starvik@axis.com> (maintainer:CRIS PORT) Jesper Nilsson <jesper.nilsson@axis.com> (maintainer:CRIS PORT) linux-cris-kernel@axis.com (open list:CRIS PORT)
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 0314e32..982d562 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig @@ -46,7 +46,6 @@ config CRIS select ARCH_WANT_IPC_PARSE_VERSION select GENERIC_IRQ_SHOW select GENERIC_IOMAP - select GENERIC_CMOS_UPDATE select MODULES_USE_ELF_RELA select CLONE_BACKWARDS2 select OLD_SIGSUSPEND diff --git a/arch/cris/kernel/time.c b/arch/cris/kernel/time.c index 7780d37..2dda6da 100644 --- a/arch/cris/kernel/time.c +++ b/arch/cris/kernel/time.c @@ -39,31 +39,6 @@ extern unsigned long loops_per_jiffy; /* init/main.c */ unsigned long loops_per_usec; -int set_rtc_mmss(unsigned long nowtime) -{ - D(printk(KERN_DEBUG "set_rtc_mmss(%lu)\n", nowtime)); - return 0; -} - -/* grab the time from the RTC chip */ -unsigned long get_cmos_time(void) -{ - return 0; -} - - -int update_persistent_clock(struct timespec now) -{ - return set_rtc_mmss(now.tv_sec); -} - -void read_persistent_clock(struct timespec *ts) -{ - ts->tv_sec = 0; - ts->tv_nsec = 0; -} - - extern void cris_profile_sample(struct pt_regs* regs); void