diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2001-05-05 20:57:05 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2001-05-05 20:57:05 +0000 |
| commit | 368552036fe6029364e1abc2351955db681286fc (patch) | |
| tree | b3e9a57702ccbbcd0869d57d84ba28c1e1033e05 /sys/arch/powerpc/include | |
| parent | e64b8c0b9c88452904cfa97be25cfec4e21e04ce (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/powerpc/include')
| -rw-r--r-- | sys/arch/powerpc/include/param.h | 11 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/vmparam.h | 10 |
2 files changed, 9 insertions, 12 deletions
diff --git a/sys/arch/powerpc/include/param.h b/sys/arch/powerpc/include/param.h index 64e7b766bc1..6632d9fd25d 100644 --- a/sys/arch/powerpc/include/param.h +++ b/sys/arch/powerpc/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.13 2001/02/07 06:03:53 drahn Exp $ */ +/* $OpenBSD: param.h,v 1.14 2001/05/05 20:56:50 art Exp $ */ /* $NetBSD: param.h,v 1.1 1996/09/30 16:34:28 ws Exp $ */ /*- @@ -63,9 +63,6 @@ #define BLKDEV_IOSIZE NBPG #define MAXPHYS (64 * 1024) /* max raw I/O transfer size */ -#define CLSIZELOG2 0 -#define CLSIZE (1 << CLSIZELOG2) - #define UPAGES 4 #define USPACE (UPAGES * NBPG) @@ -73,7 +70,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. @@ -94,10 +91,10 @@ #define MSGBUFSIZE (NBPG*2) /* - * Size of kernel malloc arena in CLBYTES-sized logical pages. + * Size of kernel malloc arena in logical pages. */ #ifndef NKMEMCLUSTERS -#define NKMEMCLUSTERS (16 * 1024 * 1024 / CLBYTES) +#define NKMEMCLUSTERS (16 * 1024 * 1024 / PAGE_SIZE) #endif /* diff --git a/sys/arch/powerpc/include/vmparam.h b/sys/arch/powerpc/include/vmparam.h index e5799f5021d..94bf42327b0 100644 --- a/sys/arch/powerpc/include/vmparam.h +++ b/sys/arch/powerpc/include/vmparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmparam.h,v 1.8 2001/03/29 18:52:19 drahn Exp $ */ +/* $OpenBSD: vmparam.h,v 1.9 2001/05/05 20:56:50 art Exp $ */ /* $NetBSD: vmparam.h,v 1.1 1996/09/30 16:34:38 ws Exp $ */ /*- @@ -35,7 +35,7 @@ #ifndef MACHINE_VMPARAM_H #define MACHINE_VMPARAM_H -#define USRTEXT CLBYTES +#define USRTEXT PAGE_SIZE #define USRSTACK VM_MAXUSER_ADDRESS #ifndef MAXTSIZ @@ -106,9 +106,9 @@ extern vm_offset_t ppc_kvm_size; #define MACHINE_NEW_NONCONTIG /* VM <=> pmap interface modifier */ -#define VM_KMEM_SIZE (NKMEMCLUSTERS * CLBYTES) -#define VM_MBUF_SIZE (NMBCLUSTERS * CLBYTES) -#define VM_PHYS_SIZE (USRIOSIZE * CLBYTES) +#define VM_KMEM_SIZE (NKMEMCLUSTERS * PAGE_SIZE) +#define VM_MBUF_SIZE (NMBCLUSTERS * PAGE_SIZE) +#define VM_PHYS_SIZE (USRIOSIZE * PAGE_SIZE) struct pmap_physseg { struct pv_entry *pvent; |