Changes in kernel/generic/src/time/clock.c [057e77f:b0c2075] in mainline

File:

• kernel/generic/src/time/clock.c (modified) (3 diffs)

kernel/generic/src/time/clock.c

@@ -81 +81 @@
 void clock_counter_init(void)
 {
-        void *faddr = frame_alloc(ONE_FRAME, FRAME_ATOMIC);
-        if (!faddr)
+        uintptr_t faddr = frame_alloc(1, FRAME_ATOMIC, 0);
+        if (faddr == 0)
                 panic("Cannot allocate page for clock.");
         
@@ -91 +91 @@
         uptime->useconds = 0;
         
-        clock_parea.pbase = (uintptr_t) faddr;
+        clock_parea.pbase = faddr;
         clock_parea.frames = 1;
         clock_parea.unpriv = true;
@@ -212 +212 @@
                 irq_spinlock_unlock(&THREAD->lock, false);
                 
-                if (ticks == 0 && PREEMPTION_ENABLED) {
+                if ((!ticks) && (!PREEMPTION_DISABLED)) {
                         scheduler();
 #ifdef CONFIG_UDEBUG