diff options
Diffstat (limited to 'kern')
| -rw-r--r-- | kern/ast.h | 2 | ||||
| -rw-r--r-- | kern/boot_script.c | 8 | ||||
| -rw-r--r-- | kern/boot_script.h | 2 | ||||
| -rw-r--r-- | kern/bootstrap.c | 2 | ||||
| -rw-r--r-- | kern/lock.c | 8 |
5 files changed, 11 insertions, 11 deletions
@@ -68,7 +68,7 @@ #define AST_PER_THREAD (AST_HALT | AST_TERMINATE | MACHINE_AST_PER_THREAD) -typedef unsigned int ast_t; +typedef unsigned long ast_t; extern volatile ast_t need_ast[NCPUS]; diff --git a/kern/boot_script.c b/kern/boot_script.c index aa6833b..b2e9393 100644 --- a/kern/boot_script.c +++ b/kern/boot_script.c @@ -67,7 +67,7 @@ static int symtab_index = 0; /* Create a task and suspend it. */ static int -create_task (struct cmd *cmd, int *val) +create_task (struct cmd *cmd, long *val) { int err = boot_script_task_create (cmd); *val = (long) cmd->task; @@ -76,14 +76,14 @@ create_task (struct cmd *cmd, int *val) /* Resume a task. */ static int -resume_task (struct cmd *cmd, int *val) +resume_task (struct cmd *cmd, long *val) { return boot_script_task_resume (cmd); } /* Resume a task when the user hits return. */ static int -prompt_resume_task (struct cmd *cmd, int *val) +prompt_resume_task (struct cmd *cmd, long *val) { return boot_script_prompt_task_resume (cmd); } @@ -659,7 +659,7 @@ boot_script_exec () /* Create an entry for the variable NAME with TYPE and value VAL, in the symbol table. */ int -boot_script_set_variable (const char *name, int type, int val) +boot_script_set_variable (const char *name, int type, long val) { struct sym *sym = sym_enter (name); diff --git a/kern/boot_script.h b/kern/boot_script.h index c436ac2..c5ad673 100644 --- a/kern/boot_script.h +++ b/kern/boot_script.h @@ -102,7 +102,7 @@ int boot_script_exec (void); /* Create an entry in the symbol table for variable NAME, whose type is TYPE and value is VAL. Returns 0 on success, non-zero otherwise. */ -int boot_script_set_variable (const char *name, int type, int val); +int boot_script_set_variable (const char *name, int type, long val); /* Define the function NAME, which will return type RET_TYPE. */ int boot_script_define_function (const char *name, int ret_type, diff --git a/kern/bootstrap.c b/kern/bootstrap.c index 2b74073..c98b0a2 100644 --- a/kern/bootstrap.c +++ b/kern/bootstrap.c @@ -211,7 +211,7 @@ void bootstrap_create() char *var = memcpy (alloca (len), *ep, len); char *val = strchr (var, '='); *val++ = '\0'; - losers = boot_script_set_variable (var, VAL_STR, (int) val); + losers = boot_script_set_variable (var, VAL_STR, (long) val); if (losers) panic ("cannot set boot-script variable %s: %s", var, boot_script_error_string (losers)); diff --git a/kern/lock.c b/kern/lock.c index 2bcfa8b..44d4448 100644 --- a/kern/lock.c +++ b/kern/lock.c @@ -163,8 +163,8 @@ void simple_lock( info->l = l; /* XXX we want our return address, if possible */ #if defined(__i386__) - info->ra = *((unsigned int *)&l - 1); -#endif /* __i386__ */ + info->ra = *((unsigned long *)&l - 1); +#endif /* i386 */ } boolean_t simple_lock_try( @@ -181,8 +181,8 @@ boolean_t simple_lock_try( info->l = l; /* XXX we want our return address, if possible */ #if defined(__i386__) - info->ra = *((unsigned int *)&l - 1); -#endif /* __i386__ */ + info->ra = *((unsigned long *)&l - 1); +#endif /* i386 */ return TRUE; } |