diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/os/mem_config.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/os/memlist_new.c | 12 | ||||
| -rw-r--r-- | usr/src/uts/sfmmu/vm/hat_sfmmu.h | 10 | ||||
| -rw-r--r-- | usr/src/uts/sun4/io/trapstat.c | 6 | ||||
| -rw-r--r-- | usr/src/uts/sun4/os/memlist.c | 2 |
5 files changed, 16 insertions, 16 deletions
diff --git a/usr/src/uts/common/os/mem_config.c b/usr/src/uts/common/os/mem_config.c index 857902d5e9..0d29cc59d6 100644 --- a/usr/src/uts/common/os/mem_config.c +++ b/usr/src/uts/common/os/mem_config.c @@ -669,7 +669,7 @@ kphysm_allocate_mem_handle() mutex_enter(&mem_handle_list_mutex); mutex_enter(&mhp->mh_mutex); /* handle_gen is protected by list mutex. */ - mhp->mh_exthandle = (memhandle_t)(++handle_gen); + mhp->mh_exthandle = (memhandle_t)(uintptr_t)(++handle_gen); mhp->mh_next = mem_handle_head; mem_handle_head = mhp; mutex_exit(&mem_handle_list_mutex); diff --git a/usr/src/uts/common/os/memlist_new.c b/usr/src/uts/common/os/memlist_new.c index 5b291908c6..f642e3fc4e 100644 --- a/usr/src/uts/common/os/memlist_new.c +++ b/usr/src/uts/common/os/memlist_new.c @@ -20,8 +20,8 @@ * CDDL HEADER END */ /* - * Copyright (c) 1996-1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -35,7 +35,7 @@ #include <sys/memlist_impl.h> static struct memlist *memlist_freelist; -static u_int memlist_freelist_count; +static uint_t memlist_freelist_count; static kmutex_t memlist_freelist_mutex; /* @@ -73,7 +73,7 @@ void memlist_free_list(struct memlist *mlp) { struct memlist *mlendp; - u_int count; + uint_t count; if (mlp == NULL) { return; @@ -93,7 +93,7 @@ void memlist_free_block(caddr_t base, size_t bytes) { struct memlist *mlp, *mlendp; - u_int count; + uint_t count; count = bytes / sizeof (struct memlist); if (count == 0) @@ -141,7 +141,7 @@ memlist_insert( return; } if (cur->address + cur->size > start) - panic("munged memory list = 0x%x\n", curmemlistp); + panic("munged memory list = 0x%p\n", curmemlistp); } new->next = NULL; new->prev = last; diff --git a/usr/src/uts/sfmmu/vm/hat_sfmmu.h b/usr/src/uts/sfmmu/vm/hat_sfmmu.h index 04b9a6e682..b51643aadc 100644 --- a/usr/src/uts/sfmmu/vm/hat_sfmmu.h +++ b/usr/src/uts/sfmmu/vm/hat_sfmmu.h @@ -27,9 +27,9 @@ /* * VM - Hardware Address Translation management. * - * This file describes the contents of the sun referernce mmu (sfmmu) - * specific hat data structures and the sfmmu specific hat procedures. - * The machine independent interface is described in <vm/hat.h>. + * This file describes the contents of the sun-reference-mmu(sfmmu)- + * specific hat data structures and the sfmmu-specific hat procedures. + * The machine-independent interface is described in <vm/hat.h>. */ #ifndef _VM_HAT_SFMMU_H @@ -145,7 +145,7 @@ typedef struct hat sfmmu_t; /* * All shared memory segments attached with the SHM_SHARE_MMU flag (ISM) - * will be constrained to a 4M, 32M or 256M alignment. Also since every newly + * will be constrained to a 4M, 32M or 256M alignment. Also since every newly- * created ISM segment is created out of a new address space at base va * of 0 we don't need to store it. */ @@ -1426,7 +1426,7 @@ label3:; #define NO_VCOLOR (-1) #define addr_to_vcolor(addr) \ - (((uint_t)(addr) >> MMU_PAGESHIFT) & vac_colors_mask) + (((uint_t)(uintptr_t)(addr) >> MMU_PAGESHIFT) & vac_colors_mask) /* * The field p_index in the psm page structure is for large pages support. diff --git a/usr/src/uts/sun4/io/trapstat.c b/usr/src/uts/sun4/io/trapstat.c index 0d3d8bb117..46158e5aa4 100644 --- a/usr/src/uts/sun4/io/trapstat.c +++ b/usr/src/uts/sun4/io/trapstat.c @@ -1317,9 +1317,9 @@ trapstat_make_traptab(tstat_percpu_t *tcpu) for (nent = 0; nent < TSTAT_TOTAL_NENT; nent++) { if (tstat_enabled[nent]) { bcopy(enabled, ent, sizeof (enabled)); - ent[TSTAT_ENABLED_STATHI] |= HI22(stat); - ent[TSTAT_ENABLED_STATLO_LD] |= LO10(stat); - ent[TSTAT_ENABLED_STATLO_ST] |= LO10(stat); + ent[TSTAT_ENABLED_STATHI] |= HI22((uintptr_t)stat); + ent[TSTAT_ENABLED_STATLO_LD] |= LO10((uintptr_t)stat); + ent[TSTAT_ENABLED_STATLO_ST] |= LO10((uintptr_t)stat); ent[TSTAT_ENABLED_BA] |= DISP22(va + en_baoffs, orig); } else { bcopy(disabled, ent, sizeof (disabled)); diff --git a/usr/src/uts/sun4/os/memlist.c b/usr/src/uts/sun4/os/memlist.c index 485d1d87eb..fab93b55ad 100644 --- a/usr/src/uts/sun4/os/memlist.c +++ b/usr/src/uts/sun4/os/memlist.c @@ -468,7 +468,7 @@ tryagain: tmp->bufsize = len; tmp->ptr = (void *)BOP_ALLOC(bootops, 0, tmp->bufsize, align); if (tmp->ptr == NULL) - panic("cannot allocate %d bytes for \"%s\" property", + panic("cannot allocate %lu bytes for \"%s\" property", tmp->bufsize, tmp->name); } |