Changeset 6aea2e00 in mainline for kernel/arch/amd64

Timestamp:

2007-04-09T21:06:22Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ddee708

Parents:

ec5b3204

Message:

use the hlt instruction more properly

Location:

kernel/arch/amd64

Files:

• include/asm.h (modified) (1 diff)
• src/pm.c (modified) (1 diff)

kernel/arch/amd64/include/asm.h

@@ -56 +56 @@
 }
 
-static inline void cpu_sleep(void) { __asm__ volatile ("hlt\n"); };
-static inline void cpu_halt(void) { __asm__ volatile ("hlt\n"); };
+static inline void cpu_sleep(void)
+{
+        asm volatile ("hlt\n");
+};
+
+static inline void cpu_halt(void)
+{
+        asm volatile ("hlt\n");
+};
 
 

kernel/arch/amd64/src/pm.c

@@ -243 +243 @@
         asm volatile (
                 "int $0x03\n"
+                "cli\n"
                 "hlt\n"
         );