Changeset 0b4a67a in mainline for kernel/generic/src/mm

Timestamp:

2010-11-20T15:33:02Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7e1f9b7

Parents:

a9c6b966

Message:

Use a more portable definition of NULL.

Location:

kernel/generic/src/mm

Files:

• as.c (modified) (1 diff)
• frame.c (modified) (3 diffs)

kernel/generic/src/mm/as.c

@@ -312 +312 @@
          *
          */
-        if (overlaps(va, size, NULL, PAGE_SIZE))
+        if (overlaps(va, size, (uintptr_t) NULL, PAGE_SIZE))
                 return false;
         

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);