Changeset 0b9ac3c in mainline for kernel/arch/ia32/include/asm.h

Timestamp:

2010-02-23T19:03:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c62d2e1

Parents:

1ccafee (diff), 5e50394 (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 mainline changes.

File:

• kernel/arch/ia32/include/asm.h (modified) (1 diff)

kernel/arch/ia32/include/asm.h

@@ -60 +60 @@
  *
  */
-static inline void cpu_halt(void)
-{
-        asm volatile (
-                "0:\n"
-                "       hlt\n"
-                "       jmp 0b\n"
-        );
+static inline __attribute__((noreturn)) void cpu_halt(void)
+{
+        while (true) {
+                asm volatile (
+                        "hlt\n"
+                );
+        }
 }