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

Timestamp:

2010-12-16T16:38:49Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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) (1 diff)

kernel/generic/src/lib/rd.c

@@ -96 +96 @@
         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;