diff options
Diffstat (limited to 'arch/cris/arch-v10/kernel')
| -rw-r--r-- | arch/cris/arch-v10/kernel/entry.S | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/time.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v10/kernel/entry.S b/arch/cris/arch-v10/kernel/entry.S index c0163bf94a5..c808005e845 100644 --- a/arch/cris/arch-v10/kernel/entry.S +++ b/arch/cris/arch-v10/kernel/entry.S @@ -270,7 +270,7 @@ #include <asm/arch/sv_addr_ag.h> #include <asm/errno.h> #include <asm/thread_info.h> -#include <asm/arch/offset.h> +#include <asm/asm-offsets.h> #include <asm/page.h> #include <asm/pgtable.h> diff --git a/arch/cris/arch-v10/kernel/time.c b/arch/cris/arch-v10/kernel/time.c index 6b7b4e0802e..dc3dfe9b4a1 100644 --- a/arch/cris/arch-v10/kernel/time.c +++ b/arch/cris/arch-v10/kernel/time.c @@ -240,7 +240,7 @@ timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) * The division here is not time critical since it will run once in * 11 minutes */ - if ((time_status & STA_UNSYNC) == 0 && + if (ntp_synced() && xtime.tv_sec > last_rtc_update + 660 && (xtime.tv_nsec / 1000) >= 500000 - (tick_nsec / 1000) / 2 && (xtime.tv_nsec / 1000) <= 500000 + (tick_nsec / 1000) / 2) { |