Changeset cf2af94 in mainline for kernel/generic/src/lib

Timestamp:

2011-02-09T11:46:47Z (15 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

Location:

kernel/generic/src/lib

Files:

• elf.c (modified) (2 diffs)
• memstr.c (modified) (1 diff)
• rd.c (modified) (2 diffs)

kernel/generic/src/lib/elf.c

@@ -157 +157 @@
         case PT_NULL:
         case PT_PHDR:
+        case PT_NOTE:
                 break;
         case PT_LOAD:
@@ -173 +174 @@
                 break;
         case PT_SHLIB:
-        case PT_NOTE:
         case PT_LOPROC:
         case PT_HIPROC:

kernel/generic/src/lib/memstr.c

@@ -62 +62 @@
         unsigned int i, j;
         
-        if (ALIGN_UP((uintptr_t) src, sizeof(unative_t)) != (uintptr_t) src ||
-            ALIGN_UP((uintptr_t) dst, sizeof(unative_t)) != (uintptr_t) dst) {
+        if (ALIGN_UP((uintptr_t) src, sizeof(sysarg_t)) != (uintptr_t) src ||
+            ALIGN_UP((uintptr_t) dst, sizeof(sysarg_t)) != (uintptr_t) dst) {
                 for (i = 0; i < cnt; i++)
                         ((uint8_t *) dst)[i] = ((uint8_t *) src)[i];
         } else { 
-                for (i = 0; i < cnt / sizeof(unative_t); i++)
-                        ((unative_t *) dst)[i] = ((unative_t *) src)[i];
+                for (i = 0; i < cnt / sizeof(sysarg_t); i++)
+                        ((sysarg_t *) dst)[i] = ((sysarg_t *) src)[i];
                 
-                for (j = 0; j < cnt % sizeof(unative_t); j++)
-                        ((uint8_t *)(((unative_t *) dst) + i))[j] =
-                            ((uint8_t *)(((unative_t *) src) + i))[j];
+                for (j = 0; j < cnt % sizeof(sysarg_t); j++)
+                        ((uint8_t *)(((sysarg_t *) dst) + i))[j] =
+                            ((uint8_t *)(((sysarg_t *) src) + i))[j];
         }
                 

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;