Changeset 371bd7d in mainline for kernel/arch/amd64/include/asm.h

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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/amd64/include/asm.h (modified) (2 diffs)

kernel/arch/amd64/include/asm.h

@@ -37 +37 @@
 
 #include <config.h>
-#include <arch/types.h>
 #include <typedefs.h>
 
@@ -68 +67 @@
 }
 
-static inline void cpu_halt(void)
-{
-        asm volatile (
-                "0:\n"
-                "       hlt\n"
-                "       jmp 0b\n"
-        );
+static inline void __attribute__((noreturn)) cpu_halt(void)
+{
+        while (true) {
+                asm volatile (
+                        "hlt\n"
+                );
+        }
 }