Changeset 0b4a67a in mainline for kernel

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

Files:

• arch/amd64/src/debugger.c (modified) (2 diffs)
• arch/mips32/src/debugger.c (modified) (3 diffs)
• arch/sparc64/src/mm/sun4u/frame.c (modified) (1 diff)
• generic/include/typedefs.h (modified) (1 diff)
• generic/src/main/main.c (modified) (1 diff)
• generic/src/mm/as.c (modified) (1 diff)
• generic/src/mm/frame.c (modified) (3 diffs)
• generic/src/synch/smc.c (modified) (1 diff)

kernel/arch/amd64/src/debugger.c

@@ -260 +260 @@
         }
         
-        cur->address = NULL;
+        cur->address = (uintptr_t) NULL;
         
         setup_dr(slot);
@@ -313 +313 @@
         unsigned int i;
         for (i = 0; i < BKPOINTS_MAX; i++)
-                breakpoints[i].address = NULL;
+                breakpoints[i].address = (uintptr_t) NULL;
         
 #ifdef CONFIG_KCONSOLE

kernel/arch/mips32/src/debugger.c

@@ -247 +247 @@
         smc_coherence(((uint32_t *) cur->address)[1]);
         
-        cur->address = NULL;
+        cur->address = (uintptr_t) NULL;
         
         irq_spinlock_unlock(&bkpoint_lock, true);
@@ -289 +289 @@
         
         for (i = 0; i < BKPOINTS_MAX; i++)
-                breakpoints[i].address = NULL;
+                breakpoints[i].address = (uintptr_t) NULL;
         
 #ifdef CONFIG_KCONSOLE
@@ -417 +417 @@
                 /* Remove one-shot breakpoint */
                 if ((cur->flags & BKPOINT_ONESHOT))
-                        cur->address = NULL;
+                        cur->address = (uintptr_t) NULL;
                 
                 /* Remove in-progress flag */

kernel/arch/sparc64/src/mm/sun4u/frame.c

@@ -41 +41 @@
 #include <macros.h>
 
-uintptr_t last_frame = NULL;
+uintptr_t last_frame = (uintptr_t) NULL;
 
 /** Create memory zones according to information stored in memmap.

kernel/generic/include/typedefs.h

@@ -40 +40 @@
 #include <arch/types.h>
 
-#define NULL  0UL
+#define NULL    ((void *) 0)
 
 #define false  0

kernel/generic/src/main/main.c

@@ -97 +97 @@
 /** Boot allocations. */
 ballocs_t ballocs = {
-        .base = NULL,
+        .base = (uintptr_t) NULL,
         .size = 0
 };

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

kernel/generic/src/synch/smc.c

@@ -44 +44 @@
 unative_t sys_smc_coherence(uintptr_t va, size_t size)
 {
-        if (overlaps(va, size, NULL, PAGE_SIZE))
+        if (overlaps(va, size, (uintptr_t) NULL, PAGE_SIZE))
                 return EINVAL;