diff options
Diffstat (limited to 'arch/parisc')
-rw-r--r-- | arch/parisc/Kconfig | 4 | ||||
-rw-r--r-- | arch/parisc/kernel/time.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index 1c2d87435233..0b07922a2ac6 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig | |||
@@ -49,6 +49,10 @@ config ISA_DMA_API | |||
49 | bool | 49 | bool |
50 | default y | 50 | default y |
51 | 51 | ||
52 | config ARCH_MAY_HAVE_PC_FDC | ||
53 | bool | ||
54 | default y | ||
55 | |||
52 | source "init/Kconfig" | 56 | source "init/Kconfig" |
53 | 57 | ||
54 | 58 | ||
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c index 6cf7407344ba..7ff67f8e9f8c 100644 --- a/arch/parisc/kernel/time.c +++ b/arch/parisc/kernel/time.c | |||
@@ -188,10 +188,7 @@ do_settimeofday (struct timespec *tv) | |||
188 | set_normalized_timespec(&xtime, sec, nsec); | 188 | set_normalized_timespec(&xtime, sec, nsec); |
189 | set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec); | 189 | set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec); |
190 | 190 | ||
191 | time_adjust = 0; /* stop active adjtime() */ | 191 | ntp_clear(); |
192 | time_status |= STA_UNSYNC; | ||
193 | time_maxerror = NTP_PHASE_LIMIT; | ||
194 | time_esterror = NTP_PHASE_LIMIT; | ||
195 | } | 192 | } |
196 | write_sequnlock_irq(&xtime_lock); | 193 | write_sequnlock_irq(&xtime_lock); |
197 | clock_was_set(); | 194 | clock_was_set(); |