diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1998-08-16 01:21:52 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1998-08-16 01:21:52 +0000 |
| commit | 86a14a7a0aa00514f670234d7da4fca666ef97b2 (patch) | |
| tree | 15b6ec0d874d0adefec798c7746356bdd80ceb8c /sys/kern | |
| parent | 9d97be35113fa6aa1f070bb8fca7f5a78aeb46b2 (diff) | |
Notes
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_malloc.c | 6 | ||||
| -rw-r--r-- | sys/kern/link_aout.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index c7a25d97c1bc..618b726361c0 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_malloc.c 8.3 (Berkeley) 1/4/94 - * $Id: kern_malloc.c,v 1.45 1998/03/08 09:56:49 julian Exp $ + * $Id: kern_malloc.c,v 1.46 1998/07/29 17:38:14 bde Exp $ */ #include "opt_vm.h" @@ -205,7 +205,7 @@ malloc(size, type, flags) #if BYTE_ORDER == LITTLE_ENDIAN freep->type = (struct malloc_type *)WEIRD_ADDR; #endif - if (((long)(&freep->next)) & 0x2) + if ((intptr_t)(void *)&freep->next & 0x2) freep->next = (caddr_t)((WEIRD_ADDR >> 16)|(WEIRD_ADDR << 16)); else freep->next = (caddr_t)WEIRD_ADDR; @@ -279,7 +279,7 @@ free(addr, type) alloc = addrmask[BUCKETINDX(PAGE_SIZE)]; else alloc = addrmask[kup->ku_indx]; - if (((u_long)addr & alloc) != 0) + if (((uintptr_t)(void *)addr & alloc) != 0) panic("free: unaligned addr %p, size %ld, type %s, mask %ld", (void *)addr, size, type->ks_shortdesc, alloc); #endif /* DIAGNOSTIC */ diff --git a/sys/kern/link_aout.c b/sys/kern/link_aout.c index 5b4e47ce059e..a24c07739dce 100644 --- a/sys/kern/link_aout.c +++ b/sys/kern/link_aout.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: link_aout.c,v 1.8 1998/07/15 02:32:11 bde Exp $ + * $Id: link_aout.c,v 1.9 1998/08/12 08:44:21 dfr Exp $ */ #include <sys/param.h> @@ -476,7 +476,7 @@ link_aout_search_symbol(linker_file_t lf, caddr_t value, linker_sym_t* sym, long* diffp) { aout_file_t af = lf->priv; - u_long off = (u_long) value; + u_long off = (uintptr_t) (void *) value; u_long diff = off; struct nzlist* sp; struct nzlist* ep; |