Changeset 3f03199 in mainline for kernel/generic/src/time/clock.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• kernel/generic/src/time/clock.c (modified) (2 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;