summaryrefslogtreecommitdiff
path: root/sys/arch/mvme88k/include
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2001-05-05 20:57:05 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2001-05-05 20:57:05 +0000
commit368552036fe6029364e1abc2351955db681286fc (patch)
treeb3e9a57702ccbbcd0869d57d84ba28c1e1033e05 /sys/arch/mvme88k/include
parente64b8c0b9c88452904cfa97be25cfec4e21e04ce (diff)
Get rid of CLSIZE and all related stuff.
CLSIZE -> 1 CLBYTES -> PAGE_SIZE OLOFSET -> PAGE_MASK etc. At the same time some archs needed some cleaning in vmparam.h so that goes in at the same time.
Diffstat (limited to 'sys/arch/mvme88k/include')
-rw-r--r--sys/arch/mvme88k/include/param.h14
-rw-r--r--sys/arch/mvme88k/include/vmparam.h6
2 files changed, 8 insertions, 12 deletions
diff --git a/sys/arch/mvme88k/include/param.h b/sys/arch/mvme88k/include/param.h
index 6f229547d5c..1611c25078d 100644
--- a/sys/arch/mvme88k/include/param.h
+++ b/sys/arch/mvme88k/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.15 2001/03/09 05:44:40 smurph Exp $ */
+/* $OpenBSD: param.h,v 1.16 2001/05/05 20:56:46 art Exp $ */
/*
* Copyright (c) 1999 Steve Murphree, Jr.
* Copyright (c) 1988 University of Utah.
@@ -40,7 +40,7 @@
* from: Utah $Hdr: machparam.h 1.11 89/08/14$
*
* @(#)param.h 7.8 (Berkeley) 6/28/91
- * $Id: param.h,v 1.15 2001/03/09 05:44:40 smurph Exp $
+ * $Id: param.h,v 1.16 2001/05/05 20:56:46 art Exp $
*/
#ifndef _MACHINE_PARAM_H_
#define _MACHINE_PARAM_H_
@@ -95,10 +95,6 @@
#define BLKDEV_IOSIZE 2048 /* Should this be changed? XXX */
#define MAXPHYS (64 * 1024) /* max raw I/O transfer size */
-#define CLSIZE 1
-#define CLSIZELOG2 0
-
-/* NOTE: SSIZE, SINCR and UPAGES must be multiples of CLSIZE */
#define SSIZE 1 /* initial stack size/NBPG */
#define SINCR 1 /* increment of stack/NBPG */
#define USPACE ctob(UPAGES)
@@ -116,7 +112,7 @@
/*
* Constants related to network buffer management.
- * MCLBYTES must be no larger than CLBYTES (the software page size), and,
+ * MCLBYTES must be no larger than the software page size, and,
* on machines that exchange pages of input or output buffers with mbuf
* clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple
* of the hardware page size.
@@ -135,10 +131,10 @@
#endif
/*
- * Size of kernel malloc arena in CLBYTES-sized logical pages
+ * Size of kernel malloc arena in logical pages
*/
#ifndef NKMEMCLUSTERS
-#define NKMEMCLUSTERS (4096*1024/CLBYTES)
+#define NKMEMCLUSTERS (4096*1024/PAGE_SIZE)
#endif
#define MSGBUFSIZE 4096
diff --git a/sys/arch/mvme88k/include/vmparam.h b/sys/arch/mvme88k/include/vmparam.h
index e6fbbe5e2b0..d4d294c63fe 100644
--- a/sys/arch/mvme88k/include/vmparam.h
+++ b/sys/arch/mvme88k/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.9 2001/03/07 23:37:17 miod Exp $ */
+/* $OpenBSD: vmparam.h,v 1.10 2001/05/05 20:56:46 art Exp $ */
/*
* Mach Operating System
* Copyright (c) 1992 Carnegie Mellon University
@@ -175,8 +175,8 @@
/* 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)
+#define VM_KMEM_SIZE (NKMEMCLUSTERS*PAGE_SIZE)
+#define VM_PHYS_SIZE (USRIOSIZE*PAGE_SIZE)
/*
* Conversion between MACHINE pages and VM pages