Changeset b5e68c8 in mainline for kernel/generic/src/lib/rd.c

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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.

File:

• kernel/generic/src/lib/rd.c (modified) (2 diffs)

kernel/generic/src/lib/rd.c

@@ -90 +90 @@
             FRAME_SIZE);
         rd_parea.frames = SIZE2FRAMES(dsize);
+        rd_parea.unpriv = false;
         ddi_parea_register(&rd_parea);
 
@@ -96 +97 @@
         sysinfo_set_item_val("rd.size", NULL, dsize);
         sysinfo_set_item_val("rd.address.physical", NULL,
-            (unative_t) KA2PA((void *) header + hsize));
+            (sysarg_t) KA2PA((void *) header + hsize));
 
         return RE_OK;