diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c index 9dbca5cca8ba..e42d1ada07dc 100644 --- a/sys/arch/alpha/alpha/machdep.c +++ b/sys/arch/alpha/alpha/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.99 1998/01/31 10:32:49 ross Exp $ */ +/* $NetBSD: machdep.c,v 1.100 1998/02/10 03:52:05 thorpej Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -29,7 +29,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.99 1998/01/31 10:32:49 ross Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.100 1998/02/10 03:52:05 thorpej Exp $"); #include #include @@ -182,9 +182,9 @@ struct bootinfo bootinfo; struct platform platform; -u_int32_t vm_mbuf_size = (NMBCLUSTERS*MCLBYTES); -u_int32_t vm_kmem_size = (NKMEMCLUSTERS*CLBYTES); -u_int32_t vm_phys_size = (USRIOSIZE*CLBYTES); +u_int32_t vm_mbuf_size = _VM_MBUF_SIZE; +u_int32_t vm_kmem_size = _VM_KMEM_SIZE; +u_int32_t vm_phys_size = _VM_PHYS_SIZE; #ifdef DDB /* start and end of kernel symbol table */ diff --git a/sys/arch/alpha/include/vmparam.h b/sys/arch/alpha/include/vmparam.h index c9d89c53f9af..28c66a05b295 100644 --- a/sys/arch/alpha/include/vmparam.h +++ b/sys/arch/alpha/include/vmparam.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.6 1997/09/23 23:23:23 mjacob Exp $ */ +/* $NetBSD: vmparam.h,v 1.7 1998/02/10 03:52:06 thorpej Exp $ */ #ifndef _ALPHA_VMPARAM_H #define _ALPHA_VMPARAM_H /* @@ -136,16 +136,20 @@ #define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)ALPHA_K1SEG_END) /* virtual sizes (bytes) for various kernel submaps */ +#define _VM_MBUF_SIZE (NMBCLUSTERS*MCLBYTES) +#define _VM_KMEM_SIZE (NKMEMCLUSTERS*CLBYTES) +#define _VM_PHYS_SIZE (USRIOSIZE*CLBYTES) + #ifndef _KERNEL -#define VM_MBUF_SIZE (NMBCLUSTERS*MCLBYTES) -#define VM_KMEM_SIZE (NKMEMCLUSTERS*CLBYTES) -#define VM_PHYS_SIZE (USRIOSIZE*CLBYTES) +#define VM_MBUF_SIZE _VM_MBUF_SIZE +#define VM_KMEM_SIZE _VM_KMEM_SIZE +#define VM_PHYS_SIZE _VM_PHYS_SIZE #else extern u_int32_t vm_mbuf_size, vm_kmem_size, vm_phys_size; #define VM_MBUF_SIZE vm_mbuf_size #define VM_KMEM_SIZE vm_kmem_size #define VM_PHYS_SIZE vm_phys_size -#endif +#endif /* _KERNEL */ /* some Alpha-specific constants */ #define VPTBASE ((vm_offset_t)0xfffffffc00000000) /* Virt. pg table */