Changes in kernel/arch/ia64/src/ia64.c [36df4109:2902e1bb] in mainline

File:

• kernel/arch/ia64/src/ia64.c (modified) (8 diffs)

kernel/arch/ia64/src/ia64.c

@@ -34 +34 @@
 
 #include <arch.h>
-#include <arch/arch.h>
 #include <typedefs.h>
 #include <errno.h>
 #include <interrupt.h>
-#include <arch/interrupt.h>
 #include <macros.h>
 #include <str.h>
@@ -61 +59 @@
 #endif
 
-static void ia64_pre_mm_init(void);
-static void ia64_post_mm_init(void);
-static void ia64_post_smp_init(void);
-
-arch_ops_t ia64_ops = {
-        .pre_mm_init = ia64_pre_mm_init,
-        .post_mm_init = ia64_post_mm_init,
-        .post_smp_init = ia64_post_smp_init,
-};
-
-arch_ops_t *arch_ops = &ia64_ops;
-
 /* NS16550 as a COM 1 */
 #define NS16550_IRQ  (4 + LEGACY_INTERRUPT_BASE)
@@ -82 +68 @@
 
 /** Performs ia64-specific initialization before main_bsp() is called. */
-void ia64_pre_main(void)
+void arch_pre_main(void)
 {
         init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS,
@@ -97 +83 @@
 }
 
-void ia64_pre_mm_init(void)
-{
-        if (config.cpu_active == 1)
-                exception_init();
+void arch_pre_mm_init(void)
+{
 }
 
@@ -130 +114 @@
 }
 
-void ia64_post_mm_init(void)
+void arch_post_mm_init(void)
 {
         if (config.cpu_active == 1) {
@@ -143 +127 @@
 }
 
-void ia64_post_smp_init(void)
+void arch_post_cpu_init(void)
+{
+}
+
+void arch_pre_smp_init(void)
+{
+}
+
+void arch_post_smp_init(void)
 {
         static const char *platform;
@@ -181 +173 @@
 #ifdef CONFIG_NS16550
         ns16550_instance_t *ns16550_instance
-            = ns16550_init((ns16550_t *) NS16550_BASE, NS16550_IRQ, NULL, NULL,
-            NULL);
+            = ns16550_init((ns16550_t *) NS16550_BASE, NS16550_IRQ, NULL, NULL);
         if (ns16550_instance) {
                 srln_instance_t *srln_instance = srln_init();
@@ -255 +246 @@
 }
 
+/** Set thread-local-storage pointer.
+ *
+ * We use r13 (a.k.a. tp) for this purpose.
+ */
+sysarg_t sys_tls_set(uintptr_t addr)
+{
+        return EOK;
+}
+
 void arch_reboot(void)
 {