From 89ec6ec6bf59410da281651fbe2eb535ca4a879b Mon Sep 17 00:00:00 2001
From: "Rodney W. Grimes" <rgrimes@FreeBSD.org>
Date: Fri, 8 Oct 1993 12:49:55 +0000
Subject: [PATCH] Removed patch kit header.  Cleaned up tabbing and removed
 extra blank lines to match NetBSD.  Added $Id$. Added MID_MACHINE from
 NetBSD. Removed definition of DELAY() for non-kernel soures. Fixed some small
 english errors that had been corrected in NetBSD. File is now identical to
 NetBSD's, but will be changing soon for some of my clean up work.

---
 sys/i386/include/param.h | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h
index 8d30fac4db16..c3b3d8a30300 100644
--- a/sys/i386/include/param.h
+++ b/sys/i386/include/param.h
@@ -33,24 +33,16 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)param.h	5.8 (Berkeley) 6/28/91
- *
- * PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
- * --------------------         -----   ----------------------
- * CURRENT PATCH LEVEL:         2       00166
- * --------------------         -----   ----------------------
- *
- * 08 Apr 93	Andrew Herbert		Fixes for kmem_alloc panics
- *		Rodney W. Grimes	Tuneable mbuf sizes
- * 04 Jun 93	Rodney W. Grimes	Change default mbuf size to 2048 via
- *					MCLSHIFT.
+ *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
+ *	$Id$
  */
 
 /*
  * Machine dependent constants for Intel 386.
  */
 
-#define MACHINE "i386"
+#define MACHINE		"i386"
+#define MID_MACHINE	MID_I386
 
 /*
  * Round p (pointer or byte index) up to a correctly-aligned value
@@ -60,7 +52,6 @@
 #define ALIGNBYTES	(sizeof(int) - 1)
 #define ALIGN(p)	(((u_int)(p) + ALIGNBYTES) &~ ALIGNBYTES)
 
-
 #define	NBPG		4096		/* bytes/page */
 #define	PGOFSET		(NBPG-1)	/* byte offset into page */
 #define	PGSHIFT		12		/* LOG2(NBPG) */
@@ -101,8 +92,8 @@
 #ifndef	MCLSHIFT
 #define	MCLSHIFT	11		/* convert bytes to m_buf clusters */
 #endif	/* MCLSHIFT */
-#define	MCLBYTES	(1 << MCLSHIFT)	/* size of an m_buf cluster */
-#define	MCLOFSET	(MCLBYTES - 1)	/* offset within an m_buf cluster */
+#define	MCLBYTES	(1 << MCLSHIFT)	/* size of a m_buf cluster */
+#define	MCLOFSET	(MCLBYTES - 1)	/* offset within a m_buf cluster */
 
 #ifndef NMBCLUSTERS
 #ifdef GATEWAY
@@ -160,7 +151,3 @@
 #define i386_dtob(x)		((unsigned)(x) << PDRSHIFT)
 #define i386_btop(x)		((unsigned)(x) >> PGSHIFT)
 #define i386_ptob(x)		((unsigned)(x) << PGSHIFT)
-
-#ifndef KERNEL
-#define	DELAY(n)	{ volatile int N = (n); while (--N > 0); }
-#endif