Changeset 696979ce in mainline for kernel/arch/arm32/src/arm32.c

Timestamp:

2010-02-06T10:54:21Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bda2f96

Parents:

3f93cdbe (diff), 25e963a (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:

Merge from mainline.

File:

• kernel/arch/arm32/src/arm32.c (modified) (2 diffs)

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