timecounter: Honor FFCLOCK define

Update #2271.
This commit is contained in:
Alexander Krutwig
2015-05-12 12:12:18 +02:00
committed by Sebastian Huber
parent 664f8446f4
commit cc6938455e

View File

@@ -994,11 +994,13 @@ dtrace_getnanotime(struct timespec *tsp)
} while (gen == 0 || gen != th->th_generation); } while (gen == 0 || gen != th->th_generation);
} }
#ifdef FFCLOCK
/* /*
* System clock currently providing time to the system. Modifiable via sysctl * System clock currently providing time to the system. Modifiable via sysctl
* when the FFCLOCK option is defined. * when the FFCLOCK option is defined.
*/ */
int sysclock_active = SYSCLOCK_FBCK; int sysclock_active = SYSCLOCK_FBCK;
#endif
/* Internal NTP status and error estimates. */ /* Internal NTP status and error estimates. */
extern int time_status; extern int time_status;
@@ -1046,7 +1048,9 @@ sysclock_getsnapshot(struct sysclock_snap *clock_snap, int fast)
} while (gen == 0 || gen != th->th_generation); } while (gen == 0 || gen != th->th_generation);
clock_snap->delta = delta; clock_snap->delta = delta;
#ifdef FFCLOCK
clock_snap->sysclock_active = sysclock_active; clock_snap->sysclock_active = sysclock_active;
#endif
/* Record feedback clock status and error. */ /* Record feedback clock status and error. */
clock_snap->fb_info.status = time_status; clock_snap->fb_info.status = time_status;