Changeset df29f24 in mainline for kernel/generic/src/lib/memfnc.c

Timestamp:

2011-06-01T09:04:08Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0a7627b, c9f0975

Parents:

e51a514 (diff), 5d1b3aa (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

Conflicts - trivial to solve
In kernel/generic/src/mm/page.c - sys_page_find_mapping does
not use locking when accessing page tables (hope that is correct).

File:

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

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;