Module Name: src
Committed By: matt
Date: Sat Aug 22 06:45:31 UTC 2009
Modified Files:
src/sys/arch/algor/include [matt-nb5-mips64]: param.h
src/sys/arch/arc/include [matt-nb5-mips64]: param.h
src/sys/arch/cobalt/include [matt-nb5-mips64]: param.h
src/sys/arch/evbmips/include [matt-nb5-mips64]: param.h
src/sys/arch/ews4800mips/include [matt-nb5-mips64]: param.h
src/sys/arch/hpcmips/include [matt-nb5-mips64]: param.h
src/sys/arch/mips/include [matt-nb5-mips64]: mips_param.h
src/sys/arch/mipsco/include [matt-nb5-mips64]: param.h
src/sys/arch/newsmips/include [matt-nb5-mips64]: param.h
src/sys/arch/playstation2/include [matt-nb5-mips64]: param.h
src/sys/arch/pmax/include [matt-nb5-mips64]: param.h
src/sys/arch/sbmips/include [matt-nb5-mips64]: param.h
src/sys/arch/sgimips/include [matt-nb5-mips64]: param.h
Log Message:
Move MACHINE_ARCH definition to <mips/mips_param.h>
Move mbuf related defines to <mips/mips_param.h>
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.78.1 src/sys/arch/algor/include/param.h
cvs rdiff -u -r1.24 -r1.24.96.1 src/sys/arch/arc/include/param.h
cvs rdiff -u -r1.14 -r1.14.74.1 src/sys/arch/cobalt/include/param.h
cvs rdiff -u -r1.5.96.1 -r1.5.96.2 src/sys/arch/evbmips/include/param.h
cvs rdiff -u -r1.1 -r1.1.98.1 src/sys/arch/ews4800mips/include/param.h
cvs rdiff -u -r1.12 -r1.12.74.1 src/sys/arch/hpcmips/include/param.h
cvs rdiff -u -r1.23.78.1 -r1.23.78.2 src/sys/arch/mips/include/mips_param.h
cvs rdiff -u -r1.9 -r1.9.38.1 src/sys/arch/mipsco/include/param.h
cvs rdiff -u -r1.16 -r1.16.38.1 src/sys/arch/newsmips/include/param.h
cvs rdiff -u -r1.5 -r1.5.74.1 src/sys/arch/playstation2/include/param.h
cvs rdiff -u -r1.38 -r1.38.76.1 src/sys/arch/pmax/include/param.h
cvs rdiff -u -r1.5 -r1.5.28.1 src/sys/arch/sbmips/include/param.h
cvs rdiff -u -r1.10 -r1.10.28.1 src/sys/arch/sgimips/include/param.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/algor/include/param.h
diff -u src/sys/arch/algor/include/param.h:1.7 src/sys/arch/algor/include/param.h:1.7.78.1
--- src/sys/arch/algor/include/param.h:1.7 Tue Sep 5 01:33:24 2006
+++ src/sys/arch/algor/include/param.h Sat Aug 22 06:45:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.7 2006/09/05 01:33:24 gdamore Exp $ */
+/* $NetBSD: param.h,v 1.7.78.1 2009/08/22 06:45:28 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -89,8 +89,6 @@
* Machine dependent constants for Algorithmics boards.
*/
-#define _MACHINE_ARCH mipsel
-#define MACHINE_ARCH "mipsel"
#define _MACHINE algor
#define MACHINE "algor"
#define MID_MACHINE MID_PMAX /* XXX Bogus, but needed for now... */
@@ -100,34 +98,6 @@
#define BLKDEV_IOSIZE 2048
#define MAXPHYS (64 * 1024) /* max raw I/O transfer size */
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than NBPG (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.
- */
-#define MSIZE 256 /* size of an mbuf */
-
-#ifndef MCLSHIFT
-#define MCLSHIFT 11 /* convert bytes to m_buf clusters */
- /* 2K cluster can hold Ether frame */
-#endif /* MCLSHIFT */
-
-#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
-
-#ifndef NMBCLUSTERS
-#if defined(_KERNEL_OPT)
-#include "opt_gateway.h"
-#endif
-
-#ifdef GATEWAY
-#define NMBCLUSTERS 2048 /* map size, max cluster allocation */
-#else
-#define NMBCLUSTERS 1024 /* map size, max cluster allocation */
-#endif
-#endif
-
#ifdef _KERNEL
#ifndef _LOCORE
Index: src/sys/arch/arc/include/param.h
diff -u src/sys/arch/arc/include/param.h:1.24 src/sys/arch/arc/include/param.h:1.24.96.1
--- src/sys/arch/arc/include/param.h:1.24 Sun Dec 11 12:16:39 2005
+++ src/sys/arch/arc/include/param.h Sat Aug 22 06:45:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.24 2005/12/11 12:16:39 christos Exp $ */
+/* $NetBSD: param.h,v 1.24.96.1 2009/08/22 06:45:28 matt Exp $ */
/* $OpenBSD: param.h,v 1.9 1997/04/30 09:54:15 niklas Exp $ */
/*
@@ -90,8 +90,6 @@
* Deskstation Tyne
* Etc
*/
-#define _MACHINE_ARCH mipsel
-#define MACHINE_ARCH "mipsel"
#define _MACHINE arc
#define MACHINE "arc"
#define MID_MACHINE MID_PMAX /* XXX Bogus, but needed for now... */
@@ -117,34 +115,6 @@
#define UVPN (UADDR>>PGSHIFT)/* virtual page number of u */
#define KERNELSTACK (UADDR+UPAGES*NBPG) /* top of kernel stack */
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than NBPG (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.
- */
-#define MSIZE 256 /* size of an mbuf */
-
-#ifndef MCLSHIFT
-#define MCLSHIFT 11 /* convert bytes to m_buf clusters */
- /* 2K cluster can hold Ether frame */
-#endif /* MCLSHIFT */
-
-#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
-
-#ifndef NMBCLUSTERS
-#if defined(_KERNEL_OPT)
-#include "opt_gateway.h"
-#endif
-
-#ifdef GATEWAY
-#define NMBCLUSTERS 2048 /* map size, max cluster allocation */
-#else
-#define NMBCLUSTERS 1024 /* map size, max cluster allocation */
-#endif
-#endif
-
/* bytes to disk blocks */
#define btodb(x) ((x) >> DEV_BSHIFT)
#define dbtob(x) ((x) << DEV_BSHIFT)
Index: src/sys/arch/cobalt/include/param.h
diff -u src/sys/arch/cobalt/include/param.h:1.14 src/sys/arch/cobalt/include/param.h:1.14.74.1
--- src/sys/arch/cobalt/include/param.h:1.14 Tue Sep 26 13:11:59 2006
+++ src/sys/arch/cobalt/include/param.h Sat Aug 22 06:45:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.14 2006/09/26 13:11:59 tsutsui Exp $ */
+/* $NetBSD: param.h,v 1.14.74.1 2009/08/22 06:45:29 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -73,8 +73,6 @@
#include <mips/mips_param.h>
-#define _MACHINE_ARCH mipsel
-#define MACHINE_ARCH "mipsel"
#define _MACHINE cobalt
#define MACHINE "cobalt"
#define MID_MACHINE MID_MIPS
@@ -84,34 +82,6 @@
#define BLKDEV_IOSIZE 2048
#define MAXPHYS (64 * 1024) /* Maximum raw I/O transfer size */
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than NBPG (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.
- */
-#define MSIZE 256 /* size of an mbuf */
-
-#ifndef MCLSHIFT
-#define MCLSHIFT 11 /* convert bytes to m_buf clusters */
- /* 2K cluster can hold Ether frame */
-#endif /* MCLSHIFT */
-
-#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
-
-#ifndef NMBCLUSTERS
-#if defined(_KERNEL_OPT)
-#include "opt_gateway.h"
-#endif
-
-#ifdef GATEWAY
-#define NMBCLUSTERS 2048 /* Map size, max cluster allocation */
-#else
-#define NMBCLUSTERS 1024 /* Map size, max cluster allocation */
-#endif
-#endif
-
#ifdef _KERNEL
#ifndef _LOCORE
Index: src/sys/arch/evbmips/include/param.h
diff -u src/sys/arch/evbmips/include/param.h:1.5.96.1 src/sys/arch/evbmips/include/param.h:1.5.96.2
--- src/sys/arch/evbmips/include/param.h:1.5.96.1 Fri Aug 21 17:52:16 2009
+++ src/sys/arch/evbmips/include/param.h Sat Aug 22 06:45:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.5.96.1 2009/08/21 17:52:16 matt Exp $ */
+/* $NetBSD: param.h,v 1.5.96.2 2009/08/22 06:45:29 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -81,26 +81,6 @@
* Machine dependent constants for MIPS evaluation boards.
*/
-#if defined(__MIPSEB__)
-# if defined(__mips_n32) || defined(__mips_n64)
-# define _MACHINE_ARCH mips64eb
-# define MACHINE_ARCH "mips64eb"
-# else
-# define _MACHINE_ARCH mipseb
-# define MACHINE_ARCH "mipseb"
-# endif
-#elif defined(__MIPSEL__)
-# if defined(__mips_n32) || defined(__mips_n64)
-# define _MACHINE_ARCH mips64el
-# define MACHINE_ARCH "mips64el"
-# else
-# define _MACHINE_ARCH mipsel
-# define MACHINE_ARCH "mipsel"
-#endif
-#else
-#error neither __MIPSEL__ nor __MIPSEB__ are defined.
-#endif
-
#define _MACHINE evbmips
#define MACHINE "evbmips"
#define MID_MACHINE MID_PMAX /* XXX Bogus, but needed for now... */
Index: src/sys/arch/ews4800mips/include/param.h
diff -u src/sys/arch/ews4800mips/include/param.h:1.1 src/sys/arch/ews4800mips/include/param.h:1.1.98.1
--- src/sys/arch/ews4800mips/include/param.h:1.1 Thu Dec 29 15:20:08 2005
+++ src/sys/arch/ews4800mips/include/param.h Sat Aug 22 06:45:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.1 2005/12/29 15:20:08 tsutsui Exp $ */
+/* $NetBSD: param.h,v 1.1.98.1 2009/08/22 06:45:29 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -73,8 +73,6 @@
#include <mips/mips_param.h>
-#define _MACHINE_ARCH mipseb
-#define MACHINE_ARCH "mipseb"
#define _MACHINE ews4800mips
#define MACHINE "ews4800mips"
#define MID_MACHINE MID_MIPS
@@ -84,34 +82,6 @@
#define BLKDEV_IOSIZE 2048
#define MAXPHYS (64 * 1024) /* Maximum raw I/O transfer size */
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than NBPG (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.
- */
-#define MSIZE 256 /* size of an mbuf */
-
-#ifndef MCLSHIFT
-#define MCLSHIFT 11 /* convert bytes to m_buf clusters */
- /* 2K cluster can hold Ether frame */
-#endif /* MCLSHIFT */
-
-#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
-
-#ifndef NMBCLUSTERS
-#if defined(_KERNEL_OPT)
-#include "opt_gateway.h"
-#endif
-
-#ifdef GATEWAY
-#define NMBCLUSTERS 2048 /* Map size, max cluster allocation */
-#else
-#define NMBCLUSTERS 1024 /* Map size, max cluster allocation */
-#endif
-#endif /* !NMBCLUSTERS */
-
#ifdef _KERNEL
#ifndef _LOCORE
Index: src/sys/arch/hpcmips/include/param.h
diff -u src/sys/arch/hpcmips/include/param.h:1.12 src/sys/arch/hpcmips/include/param.h:1.12.74.1
--- src/sys/arch/hpcmips/include/param.h:1.12 Tue Sep 26 13:11:59 2006
+++ src/sys/arch/hpcmips/include/param.h Sat Aug 22 06:45:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.12 2006/09/26 13:11:59 tsutsui Exp $ */
+/* $NetBSD: param.h,v 1.12.74.1 2009/08/22 06:45:29 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -89,9 +89,6 @@
* Machine dependent constants for mips-based Handheld PC.
*/
-#define _MACHINE_ARCH mipsel
-#define MACHINE_ARCH "mipsel"
-
#define _MACHINE hpcmips
#define MACHINE "hpcmips"
#define MID_HPCMIPS MID_PMAX /* XXX For the moment */
@@ -106,34 +103,6 @@
#define BLKDEV_IOSIZE 2048
#define MAXPHYS (64 * 1024) /* max raw I/O transfer size */
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than NBPG (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.
- */
-#define MSIZE 256 /* size of an mbuf */
-
-#ifndef MCLSHIFT
-#define MCLSHIFT 11 /* convert bytes to m_buf clusters */
- /* 2K cluster can hold Ether frame */
-#endif /* MCLSHIFT */
-
-#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
-
-#ifndef NMBCLUSTERS
-#if defined(_KERNEL_OPT)
-#include "opt_gateway.h"
-#endif
-
-#ifdef GATEWAY
-#define NMBCLUSTERS 2048 /* map size, max cluster allocation */
-#else
-#define NMBCLUSTERS 1024 /* map size, max cluster allocation */
-#endif
-#endif
-
#ifdef _KERNEL
#ifndef _LOCORE
Index: src/sys/arch/mips/include/mips_param.h
diff -u src/sys/arch/mips/include/mips_param.h:1.23.78.1 src/sys/arch/mips/include/mips_param.h:1.23.78.2
--- src/sys/arch/mips/include/mips_param.h:1.23.78.1 Thu Aug 20 07:47:52 2009
+++ src/sys/arch/mips/include/mips_param.h Sat Aug 22 06:45:30 2009
@@ -1,10 +1,33 @@
-/* $NetBSD: mips_param.h,v 1.23.78.1 2009/08/20 07:47:52 matt Exp $ */
+/* $NetBSD: mips_param.h,v 1.23.78.2 2009/08/22 06:45:30 matt Exp $ */
#ifdef _KERNEL
#include <machine/cpu.h>
#endif
/*
+ * No reason this can't be common
+ */
+#if defined(__MIPSEB__)
+# if defined(__mips_n32) || defined(__mips_n64)
+# define _MACHINE_ARCH mips64eb
+# define MACHINE_ARCH "mips64eb"
+# else
+# define _MACHINE_ARCH mipseb
+# define MACHINE_ARCH "mipseb"
+# endif
+#elif defined(__MIPSEL__)
+# if defined(__mips_n32) || defined(__mips_n64)
+# define _MACHINE_ARCH mips64el
+# define MACHINE_ARCH "mips64el"
+# else
+# define _MACHINE_ARCH mipsel
+# define MACHINE_ARCH "mipsel"
+#endif
+#else
+#error neither __MIPSEL__ nor __MIPSEB__ are defined.
+#endif
+
+/*
* On mips, UPAGES is fixed by sys/arch/mips/mips/locore code
* to be the number of per-process-wired kernel-stack pages/PTES.
*/
Index: src/sys/arch/mipsco/include/param.h
diff -u src/sys/arch/mipsco/include/param.h:1.9 src/sys/arch/mipsco/include/param.h:1.9.38.1
--- src/sys/arch/mipsco/include/param.h:1.9 Wed Oct 17 19:55:46 2007
+++ src/sys/arch/mipsco/include/param.h Sat Aug 22 06:45:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.9 2007/10/17 19:55:46 garbled Exp $ */
+/* $NetBSD: param.h,v 1.9.38.1 2009/08/22 06:45:29 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -89,8 +89,6 @@
* Machine dependent constants for Mips Corp. machines
*/
-#define _MACHINE_ARCH mipseb
-#define MACHINE_ARCH "mipseb"
#define _MACHINE mipsco
#define MACHINE "mipsco"
#define MID_MACHINE MID_MIPS
@@ -104,34 +102,6 @@
#define BLKDEV_IOSIZE 2048
#define MAXPHYS (64 * 1024) /* max raw I/O transfer size */
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than NBPG (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.
- */
-#define MSIZE 256 /* size of an mbuf */
-
-#ifndef MCLSHIFT
-#define MCLSHIFT 11 /* convert bytes to m_buf clusters */
- /* 2K cluster can hold Ether frame */
-#endif /* MCLSHIFT */
-
-#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
-
-#ifndef NMBCLUSTERS
-#if defined(_KERNEL_OPT)
-#include "opt_gateway.h"
-#endif
-
-#ifdef GATEWAY
-#define NMBCLUSTERS 2048 /* map size, max cluster allocation */
-#else
-#define NMBCLUSTERS 1024 /* map size, max cluster allocation */
-#endif
-#endif
-
#ifdef _KERNEL
#ifndef _LOCORE
Index: src/sys/arch/newsmips/include/param.h
diff -u src/sys/arch/newsmips/include/param.h:1.16 src/sys/arch/newsmips/include/param.h:1.16.38.1
--- src/sys/arch/newsmips/include/param.h:1.16 Wed Oct 17 19:55:55 2007
+++ src/sys/arch/newsmips/include/param.h Sat Aug 22 06:45:29 2009
@@ -1,4 +1,4 @@
-/* from $NetBSD: param.h,v 1.16 2007/10/17 19:55:55 garbled Exp $ */
+/* from $NetBSD: param.h,v 1.16.38.1 2009/08/22 06:45:29 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -89,8 +89,6 @@
* Machine dependent constants for mips-based NEWS.
*/
-#define _MACHINE_ARCH mipseb
-#define MACHINE_ARCH "mipseb"
#define _MACHINE newsmips
#define MACHINE "newsmips"
#define MID_MACHINE MID_MIPS
@@ -104,34 +102,6 @@
#define BLKDEV_IOSIZE 2048
#define MAXPHYS (64 * 1024) /* max raw I/O transfer size */
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than NBPG (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.
- */
-#define MSIZE 256 /* size of an mbuf */
-
-#ifndef MCLSHIFT
-#define MCLSHIFT 11 /* convert bytes to m_buf clusters */
- /* 2K cluster can hold Ether frame */
-#endif /* MCLSHIFT */
-
-#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
-
-#ifndef NMBCLUSTERS
-#if defined(_KERNEL_OPT)
-#include "opt_gateway.h"
-#endif
-
-#ifdef GATEWAY
-#define NMBCLUSTERS 2048 /* map size, max cluster allocation */
-#else
-#define NMBCLUSTERS 1024 /* map size, max cluster allocation */
-#endif
-#endif
-
#ifdef _KERNEL
#ifndef _LOCORE
Index: src/sys/arch/playstation2/include/param.h
diff -u src/sys/arch/playstation2/include/param.h:1.5 src/sys/arch/playstation2/include/param.h:1.5.74.1
--- src/sys/arch/playstation2/include/param.h:1.5 Tue Sep 26 13:11:59 2006
+++ src/sys/arch/playstation2/include/param.h Sat Aug 22 06:45:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.5 2006/09/26 13:11:59 tsutsui Exp $ */
+/* $NetBSD: param.h,v 1.5.74.1 2009/08/22 06:45:30 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -73,8 +73,6 @@
#include <mips/mips_param.h>
-#define _MACHINE_ARCH mipsel
-#define MACHINE_ARCH "mipsel"
#define _MACHINE playstation2
#define MACHINE "playstation2"
#define MID_MACHINE MID_PMAX /* XXX no suitable MID for mipsel */
@@ -84,34 +82,6 @@
#define BLKDEV_IOSIZE 2048
#define MAXPHYS (64 * 1024) /* Maximum raw I/O transfer size */
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than NBPG (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.
- */
-#define MSIZE 256 /* size of an mbuf */
-
-#ifndef MCLSHIFT
-#define MCLSHIFT 11 /* convert bytes to m_buf clusters */
- /* 2K cluster can hold Ether frame */
-#endif /* MCLSHIFT */
-
-#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
-
-#ifndef NMBCLUSTERS
-#if defined(_KERNEL_OPT)
-#include "opt_gateway.h"
-#endif
-
-#ifdef GATEWAY
-#define NMBCLUSTERS 2048 /* Map size, max cluster allocation */
-#else
-#define NMBCLUSTERS 1024 /* Map size, max cluster allocation */
-#endif
-#endif
-
#ifdef _KERNEL
#ifndef _LOCORE
Index: src/sys/arch/pmax/include/param.h
diff -u src/sys/arch/pmax/include/param.h:1.38 src/sys/arch/pmax/include/param.h:1.38.76.1
--- src/sys/arch/pmax/include/param.h:1.38 Sun Sep 10 11:12:20 2006
+++ src/sys/arch/pmax/include/param.h Sat Aug 22 06:45:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.38 2006/09/10 11:12:20 tsutsui Exp $ */
+/* $NetBSD: param.h,v 1.38.76.1 2009/08/22 06:45:30 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -89,8 +89,6 @@
* Machine dependent constants for mips-based DECstations.
*/
-#define _MACHINE_ARCH mipsel
-#define MACHINE_ARCH "mipsel"
#define _MACHINE pmax
#define MACHINE "pmax"
#define MID_MACHINE MID_PMAX
@@ -100,34 +98,6 @@
#define BLKDEV_IOSIZE 2048
#define MAXPHYS (64 * 1024) /* max raw I/O transfer size */
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than NBPG (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.
- */
-#define MSIZE 256 /* size of an mbuf */
-
-#ifndef MCLSHIFT
-#define MCLSHIFT 11 /* convert bytes to m_buf clusters */
- /* 2K cluster can hold Ether frame */
-#endif /* MCLSHIFT */
-
-#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
-
-#ifndef NMBCLUSTERS
-#if defined(_KERNEL_OPT)
-#include "opt_gateway.h"
-#endif
-
-#ifdef GATEWAY
-#define NMBCLUSTERS 2048 /* map size, max cluster allocation */
-#else
-#define NMBCLUSTERS 1024 /* map size, max cluster allocation */
-#endif
-#endif
-
#ifdef _KERNEL
#ifndef _LOCORE
Index: src/sys/arch/sbmips/include/param.h
diff -u src/sys/arch/sbmips/include/param.h:1.5 src/sys/arch/sbmips/include/param.h:1.5.28.1
--- src/sys/arch/sbmips/include/param.h:1.5 Tue Jan 8 14:38:48 2008
+++ src/sys/arch/sbmips/include/param.h Sat Aug 22 06:45:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.5 2008/01/08 14:38:48 simonb Exp $ */
+/* $NetBSD: param.h,v 1.5.28.1 2009/08/22 06:45:30 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -81,16 +81,6 @@
* Machine dependent constants for Broadcom/Sibyte boards.
*/
-#if defined(__MIPSEB__)
-#define _MACHINE_ARCH mipseb
-#define MACHINE_ARCH "mipseb"
-#elif defined(__MIPSEL__)
-#define _MACHINE_ARCH mipsel
-#define MACHINE_ARCH "mipsel"
-#else
-#error neither __MIPSEL__ nor __MIPSEB__ are defined.
-#endif
-
#define _MACHINE sbmips
#define MACHINE "sbmips"
#define MID_MACHINE MID_PMAX /* XXX Bogus, but needed for now... */
@@ -100,33 +90,6 @@
#define BLKDEV_IOSIZE 2048
#define MAXPHYS (64 * 1024) /* max raw I/O transfer size */
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than NBPG (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.
- */
-#define MSIZE 256 /* size of an mbuf */
-
-#ifndef MCLSHIFT
-# define MCLSHIFT 11 /* convert bytes to m_buf clusters */
-#endif /* MCLSHIFT */
-
-#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
-
-#ifndef NMBCLUSTERS
-#if defined(_KERNEL_OPT)
-#include "opt_gateway.h"
-#endif
-
-#ifdef GATEWAY
-#define NMBCLUSTERS 2048 /* map size, max cluster allocation */
-#else
-#define NMBCLUSTERS 1024 /* map size, max cluster allocation */
-#endif
-#endif
-
#ifdef _KERNEL
#ifndef _LOCORE
Index: src/sys/arch/sgimips/include/param.h
diff -u src/sys/arch/sgimips/include/param.h:1.10 src/sys/arch/sgimips/include/param.h:1.10.28.1
--- src/sys/arch/sgimips/include/param.h:1.10 Thu Feb 21 09:32:12 2008
+++ src/sys/arch/sgimips/include/param.h Sat Aug 22 06:45:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.10 2008/02/21 09:32:12 sekiya Exp $ */
+/* $NetBSD: param.h,v 1.10.28.1 2009/08/22 06:45:30 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -77,8 +77,6 @@
#include <mips/mips_param.h>
-#define _MACHINE_ARCH mipseb
-#define MACHINE_ARCH "mipseb"
#define _MACHINE sgimips
#define MACHINE "sgimips"
#define MID_MACHINE MID_MIPS
@@ -88,35 +86,6 @@
#define BLKDEV_IOSIZE 2048
#define MAXPHYS (64 * 1024) /* Maximum raw I/O transfer size */
-
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than NBPG (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.
- */
-#define MSIZE 256 /* size of an mbuf */
-
-#ifndef MCLSHIFT
-#define MCLSHIFT 11 /* convert bytes to m_buf clusters */
- /* 2K cluster can hold Ether frame */
-#endif /* MCLSHIFT */
-
-#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
-
-#ifndef NMBCLUSTERS
-#if defined(_KERNEL_OPT)
-#include "opt_gateway.h"
-#endif
-
-#ifdef GATEWAY
-#define NMBCLUSTERS 2048 /* Map size, max cluster allocation */
-#else
-#define NMBCLUSTERS 1024 /* Map size, max cluster allocation */
-#endif
-#endif
-
#ifdef _KERNEL
#ifndef _LOCORE
