Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/ia64/src/ia64.c

    r3a2f8aa r4872160  
    4040#include <arch/asm.h>
    4141#include <arch/register.h>
    42 #include <arch/types.h>
     42#include <typedefs.h>
    4343#include <arch/context.h>
    4444#include <arch/stack.h>
     
    4747#include <mm/as.h>
    4848#include <config.h>
     49#include <macros.h>
    4950#include <userspace.h>
    5051#include <console/console.h>
     
    6667#include <print.h>
    6768#include <sysinfo/sysinfo.h>
    68 #include <string.h>
     69#include <str.h>
    6970
    7071/* NS16550 as a COM 1 */
     
    7879void arch_pre_main(void)
    7980{
    80         /* Setup usermode init tasks. */
    81 
    82         unsigned int i;
    83        
    84         init.cnt = bootinfo->taskmap.count;
    85        
     81        init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS);
     82        size_t i;
    8683        for (i = 0; i < init.cnt; i++) {
    8784                init.tasks[i].addr =
     
    212209            (uintptr_t) I8042_BASE);
    213210#endif
    214        
     211
     212        sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
     213
    215214        sysinfo_set_item_val("ia64_iospace", NULL, true);
    216215        sysinfo_set_item_val("ia64_iospace.address", NULL, true);
Note: See TracChangeset for help on using the changeset viewer.