Changeset 5cde90f in mainline for kernel/arch/arm32

Timestamp:

2010-02-19T17:16:46Z (16 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

617652f

Parents:

b86d436 (diff), f41aa81 (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:

Synchronizing with head (which has just been synchronized with this branch).

Location:

kernel/arch/arm32

Files:

• include/asm.h (modified) (1 diff)
• src/arm32.c (modified) (3 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);
 }
 
@@ -179 +180 @@
 }
 
+void irq_initialize_arch(irq_t *irq)
+{
+        (void) irq;
+}
+
 /** @}
  */