Adapt the type used for adjtime_delta

clock_t is currently a signed type, but in NetBSD this is not the
case. As we plan on aligning our types we have to change this as this
prevents negative delta from being correctly used.

Change-Id: I9bccdee2b41626b0262471dc1900de505a1991a7

diff --git a/kernel/clock.c b/kernel/clock.c
index be6cfa572e643c51eeae84b75ef969e981a0a1e0..c371e4dc8afaa32d6da3d1c10f463b7eb09fb7df 100644 (file)
--- a/kernel/clock.c
+++ b/kernel/clock.c
@@ -67,7 +67,7 @@ static clock_t realtime = 0;
 /* Number of ticks to adjust realtime by. A negative value implies slowing
  * down realtime, a positive value implies speeding it up.
  */
-static clock_t adjtime_delta = 0;
+static int32_t adjtime_delta = 0;
 
 /*
  * The boot processor's timer interrupt handler. In addition to non-boot cpus
@@ -195,7 +195,7 @@ void set_realtime(clock_t newrealtime)
 /*===========================================================================*
  *                             set_adjtime_delta                            *
  *===========================================================================*/
-void set_adjtime_delta(clock_t ticks)
+void set_adjtime_delta(int32_t ticks)
 {
   adjtime_delta = ticks;
 }

diff --git a/kernel/proto.h b/kernel/proto.h
index e59c54d6ca181f9bcc29caa21866c682d1c9ae97..9ac2fd483b9049c2d95fec16d43350c07bedcfea 100644 (file)
--- a/kernel/proto.h
+++ b/kernel/proto.h
@@ -16,7 +16,7 @@ struct timer;
 /* clock.c */
 clock_t get_realtime(void);
 void set_realtime(clock_t);
-void set_adjtime_delta(clock_t);
+void set_adjtime_delta(int32_t);
 clock_t get_monotonic(void);
 void set_timer(struct timer *tp, clock_t t, tmr_func_t f);
 void reset_timer(struct timer *tp);

diff --git a/kernel/system/do_settime.c b/kernel/system/do_settime.c
index b9116331a731808a6243053adc0e3d18ff56d15e..c28b45e5686e5df6830328406a0a4e2269f64b66 100644 (file)
--- a/kernel/system/do_settime.c
+++ b/kernel/system/do_settime.c
@@ -17,7 +17,8 @@
  *===========================================================================*/
 int do_settime(struct proc * caller, message * m_ptr)
 {
-  clock_t newclock, ticks;
+  clock_t newclock;
+  int32_t ticks;
   time_t timediff;
   signed long long timediff_ticks;