Changeset 5cde90f in mainline for kernel/arch/ia32

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/ia32

Files:

• include/asm.h (modified) (1 diff)
• src/ia32.c (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"
+                );
+        }
 }
 

kernel/arch/ia32/src/ia32.c

@@ -234 +234 @@
 }
 
+void irq_initialize_arch(irq_t *irq)
+{
+        (void) irq;
+}
+
 /** @}
  */