diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-04 10:27:44 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-04 10:27:44 +0100 |
| commit | ba1b3afd50913473f3036a63b4a82d7ba5c42009 (patch) | |
| tree | 9dff0ddec4bf8b927a025b4bf9882cb1731170f3 /kern/lock.c | |
| parent | bfdb3be16e5a20eebc97b3ca613d9a4da4465533 (diff) | |
| parent | 51e87d005139a435cd846ac5c224eed5042c4fa0 (diff) | |
Merge branch 'master' into master-gdb_stubs
Diffstat (limited to 'kern/lock.c')
| -rw-r--r-- | kern/lock.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kern/lock.c b/kern/lock.c index 0c61227a..44d4448e 100644 --- a/kern/lock.c +++ b/kern/lock.c @@ -162,8 +162,8 @@ void simple_lock( info = &simple_locks_info[simple_locks_taken++]; info->l = l; /* XXX we want our return address, if possible */ -#ifdef i386 - info->ra = *((unsigned int *)&l - 1); +#if defined(__i386__) + info->ra = *((unsigned long *)&l - 1); #endif /* i386 */ } @@ -180,8 +180,8 @@ boolean_t simple_lock_try( info = &simple_locks_info[simple_locks_taken++]; info->l = l; /* XXX we want our return address, if possible */ -#ifdef i386 - info->ra = *((unsigned int *)&l - 1); +#if defined(__i386__) + info->ra = *((unsigned long *)&l - 1); #endif /* i386 */ return TRUE; @@ -622,7 +622,7 @@ void db_show_all_slocks(void) info = &simple_locks_info[i]; db_printf("%d: ", i); db_printsym(info->l, DB_STGY_ANY); -#if i386 +#if defined(__i386__) db_printf(" locked by "); db_printsym(info->ra, DB_STGY_PROC); #endif |