Changeset 0b4a67a in mainline for kernel/arch

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/arch

Files:

• amd64/src/debugger.c (modified) (2 diffs)
• mips32/src/debugger.c (modified) (3 diffs)
• sparc64/src/mm/sun4u/frame.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.