BSD 4_4_Lite1 release

[unix-history] / usr / src / sys / kern / kern_malloc.c

diff --git a/usr/src/sys/kern/kern_malloc.c b/usr/src/sys/kern/kern_malloc.c
index 9a6d364..c6276bc 100644 (file)
--- a/usr/src/sys/kern/kern_malloc.c
+++ b/usr/src/sys/kern/kern_malloc.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *

- *     @(#)kern_malloc.c       8.1 (Berkeley) 6/10/93
+ *     @(#)kern_malloc.c       8.3 (Berkeley) 1/4/94

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -95,7 +95,7 @@ malloc(size, type, flags)
        register struct kmembuckets *kbp;
        register struct kmemusage *kup;
        register struct freelist *freep;
        register struct kmembuckets *kbp;
        register struct kmemusage *kup;
        register struct freelist *freep;

-       long indx, npg, alloc, allocsize;
+       long indx, npg, allocsize;

        int s;
        caddr_t va, cp, savedlist;
 #ifdef DIAGNOSTIC
        int s;
        caddr_t va, cp, savedlist;
 #ifdef DIAGNOSTIC


@@ -203,7 +203,7 @@ malloc(size, type, flags)
        freep->type = WEIRD_ADDR >> 16;
 #endif
 #if BYTE_ORDER == LITTLE_ENDIAN
        freep->type = WEIRD_ADDR >> 16;
 #endif
 #if BYTE_ORDER == LITTLE_ENDIAN

-       freep->type = WEIRD_ADDR;
+       freep->type = (short)WEIRD_ADDR;

 #endif
        if (((long)(&freep->next)) & 0x2)
                freep->next = (caddr_t)((WEIRD_ADDR >> 16)|(WEIRD_ADDR << 16));
 #endif
        if (((long)(&freep->next)) & 0x2)
                freep->next = (caddr_t)((WEIRD_ADDR >> 16)|(WEIRD_ADDR << 16));