Changeset 0b749a3 in mainline for kernel/generic/src/mm/frame.c

Timestamp:

2010-11-22T15:39:53Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0eddb76, aae339e9

Parents:

9a1d8ab (diff), 8cd1aa5e (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 development/ changes

File:

• kernel/generic/src/mm/frame.c (modified) (3 diffs)

kernel/generic/src/mm/frame.c

@@ -878 +878 @@
                  * the assert
                  */
-                ASSERT(confframe != NULL);
+                ASSERT(confframe != ADDR2PFN((uintptr_t ) NULL));
                 
                 /* If confframe is supposed to be inside our zone, then make sure
@@ -1104 +1104 @@
          */
         pfn_t pfn = ADDR2PFN(frame);
-        size_t znum = find_zone(pfn, 1, NULL);
+        size_t znum = find_zone(pfn, 1, 0);
         
         ASSERT(znum != (size_t) -1);
@@ -1141 +1141 @@
          * First, find host frame zone for addr.
          */
-        size_t znum = find_zone(pfn, 1, NULL);
+        size_t znum = find_zone(pfn, 1, 0);
         
         ASSERT(znum != (size_t) -1);