Changeset 82474ef in mainline for kernel/arch/arm32

Timestamp:

2010-02-03T12:45:26Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

210e50a

Parents:

c1d3549

Message:

improve the GCC contract of halt(), make it explicitly noreturn

Location:

kernel/arch/arm32

Files:

• include/asm.h (modified) (1 diff)
• src/arm32.c (modified) (2 diffs)

kernel/arch/arm32/include/asm.h

@@ -96 +96 @@
 }
 
-extern void cpu_halt(void);
+extern void cpu_halt(void) __attribute__((noreturn));
 extern void asm_delay_loop(uint32_t t);
 extern void userspace_asm(uintptr_t ustack, uintptr_t uspace_uarg,

kernel/arch/arm32/src/arm32.c

@@ -155 +155 @@
 void cpu_halt(void)
 {
-        machine_cpu_halt();
+        while (true)
+                machine_cpu_halt();
 }
 
@@ -162 +163 @@
 {
         /* not implemented */
-        while (1);
+        while (true);
 }