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

Timestamp:

2011-11-06T22:21:05Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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.

Location:

kernel/generic/src/lib

Files:

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

kernel/generic/src/lib/elf.c

@@ -47 +47 @@
 #include <macros.h>
 #include <arch.h>
+
+#include <lib/elf_load.h>
 
 static const char *error_codes[] = {

kernel/generic/src/lib/memfnc.c

@@ -56 +56 @@
 void *memset(void *dst, int val, size_t cnt)
 {
-        size_t i;
-        uint8_t *ptr = (uint8_t *) dst;
+        uint8_t *dp = (uint8_t *) dst;
         
-        for (i = 0; i < cnt; i++)
-                ptr[i] = val;
+        while (cnt-- != 0)
+                *dp++ = val;
         
         return dst;
@@ -83 +82 @@
         
         while (cnt-- != 0)
-                        *dp++ = *sp++;
+                *dp++ = *sp++;
         
         return dst;

kernel/generic/src/lib/rd.c

@@ -91 +91 @@
         rd_parea.frames = SIZE2FRAMES(dsize);
         rd_parea.unpriv = false;
+        rd_parea.mapped = false;
         ddi_parea_register(&rd_parea);