Changeset 19f24fd in mainline for kernel/arch/sparc64

Timestamp:

2010-02-05T22:25:52Z (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:

dafa2d04

Parents:

83349b03 (diff), d42976c (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.

Location:

kernel/arch/sparc64

Files:

• include/asm.h (modified) (1 diff)
• include/context.h (modified) (1 diff)
• src/sparc64.c (modified) (2 diffs)

kernel/arch/sparc64/include/asm.h

@@ -430 +430 @@
 }
 
-extern void cpu_halt(void);
+extern void cpu_halt(void) __attribute__((noreturn));
 extern void cpu_sleep(void);
 extern void asm_delay_loop(const uint32_t usec);

kernel/arch/sparc64/include/context.h

@@ -42 +42 @@
 #define SP_DELTA        (STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE)
 
-#ifdef context_set
-#undef context_set
-#endif
-
 #define context_set(c, _pc, stack, size)                        \
         (c)->pc = ((uintptr_t) _pc) - 8;                        \

kernel/arch/sparc64/src/sparc64.c

@@ -44 +44 @@
 #include <arch/mm/page.h>
 #include <arch/stack.h>
+#include <interrupt.h>
 #include <genarch/ofw/ofw_tree.h>
 #include <userspace.h>
@@ -166 +167 @@
 }
 
+void irq_initialize_arch(irq_t *irq)
+{
+        (void) irq;
+}
+
 /** @}
  */