Changes in kernel/arch/ia64/src/ia64.c [3a2f8aa:4872160] in mainline

File:

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

kernel/arch/ia64/src/ia64.c

@@ -40 +40 @@
 #include <arch/asm.h>
 #include <arch/register.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/context.h>
 #include <arch/stack.h>
@@ -47 +47 @@
 #include <mm/as.h>
 #include <config.h>
+#include <macros.h>
 #include <userspace.h>
 #include <console/console.h>
@@ -66 +67 @@
 #include <print.h>
 #include <sysinfo/sysinfo.h>
-#include <string.h>
+#include <str.h>
 
 /* NS16550 as a COM 1 */
@@ -78 +79 @@
 void arch_pre_main(void)
 {
-        /* Setup usermode init tasks. */
-
-        unsigned int i;
-        
-        init.cnt = bootinfo->taskmap.count;
-        
+        init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS);
+        size_t i;
         for (i = 0; i < init.cnt; i++) {
                 init.tasks[i].addr =
@@ -212 +209 @@
             (uintptr_t) I8042_BASE);
 #endif
-        
+
+        sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
+
         sysinfo_set_item_val("ia64_iospace", NULL, true);
         sysinfo_set_item_val("ia64_iospace.address", NULL, true);