Changeset 03934c9e in mainline

Timestamp:

2012-02-12T08:53:40Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

cd00f93

Parents:

50601ef (diff), e10d41a (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 with mainline

Location:

kernel/generic

Files:

• include/macros.h (modified) (1 diff)
• src/mm/km.c (modified) (1 diff)

kernel/generic/include/macros.h

@@ -69 +69 @@
     uint64_t sz2)
 {
-        uint64_t e1 = s1 + sz1;
-        uint64_t e2 = s2 + sz2;
-        
+        uint64_t e1;
+        uint64_t e2;
+
+        /* Handle the two corner cases when either sz1 or sz2 are zero. */
+        if (sz1 == 0)
+                return (s1 == s2) && (sz2 == 0);
+        e1 = s1 + sz1 - 1;      
+        if (sz2 == 0)
+                return (s1 <= s2) && (s2 <= e1);
+        e2 = s2 + sz2 - 1;
+
+        /* e1 and e2 are end addresses, the sum is imune to overflow */
         return ((s1 <= s2) && (e1 >= e2));
 }

kernel/generic/src/mm/km.c

@@ -134 +134 @@
         ASSERT(ALIGN_UP(size, FRAME_SIZE) == size);
 
+        /* Enforce natural or at least PAGE_SIZE alignment. */
         align = ispwr2(size) ? size : (1U << (fnzb(size) + 1));
         vaddr = km_page_alloc(size, max(PAGE_SIZE, align));