From owner-svn-src-all@FreeBSD.ORG  Mon Nov 23 23:23:06 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 19680106568B;
	Mon, 23 Nov 2009 23:23:06 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 089178FC08;
	Mon, 23 Nov 2009 23:23:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nANNN5XI084112;
	Mon, 23 Nov 2009 23:23:05 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nANNN5gl084110;
	Mon, 23 Nov 2009 23:23:05 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <200911232323.nANNN5gl084110@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Mon, 23 Nov 2009 23:23:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199723 - head/sys/sys
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Nov 2009 23:23:06 -0000

Author: marcel
Date: Mon Nov 23 23:23:05 2009
New Revision: 199723
URL: http://svn.freebsd.org/changeset/base/199723

Log:
  Don't make MJUMPAGESIZE equal to PAGE_SIZE unconditionally.
  When PAGE_SIZE is 16K, MJUMPAGESIZE equals MJUM16BYTES and
  causes build breakages.
  For PAGE_SIZE < 2K, define MJUMPAGESIZE as MCLBYTES.
  For PAGE_SIZE > 8K, define MJUMPAGESIZE as 8K.
  Everywhere inbetween, define MJUMPAGESIZE as PAGE_SIZE.
  
  Thus MCLBYTES <= MJUMPAGESIZE <= 8KB.

Modified:
  head/sys/sys/param.h

Modified: head/sys/sys/param.h
==============================================================================
--- head/sys/sys/param.h	Mon Nov 23 22:28:15 2009	(r199722)
+++ head/sys/sys/param.h	Mon Nov 23 23:23:05 2009	(r199723)
@@ -144,7 +144,14 @@
 
 #define MCLBYTES	(1 << MCLSHIFT)	/* size of an mbuf cluster */
 
-#define	MJUMPAGESIZE	PAGE_SIZE	/* jumbo cluster 4k */
+#if PAGE_SIZE < 2048
+#define	MJUMPAGESIZE	MCLBYTES
+#elif PAGE_SIZE <= 8192
+#define	MJUMPAGESIZE	PAGE_SIZE
+#else
+#define	MJUMPAGESIZE	(8 * 1024)
+#endif
+
 #define	MJUM9BYTES	(9 * 1024)	/* jumbo cluster 9k */
 #define	MJUM16BYTES	(16 * 1024)	/* jumbo cluster 16k */