From owner-svn-src-projects@FreeBSD.ORG  Fri Aug 14 16:15:18 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B0F5E106568F;
	Fri, 14 Aug 2009 16:15:18 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A078C8FC41;
	Fri, 14 Aug 2009 16:15:18 +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 n7EGFIeE041378;
	Fri, 14 Aug 2009 16:15:18 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7EGFI6i041376;
	Fri, 14 Aug 2009 16:15:18 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200908141615.n7EGFI6i041376@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 14 Aug 2009 16:15:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196215 - projects/mips/sys/mips/include
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Aug 2009 16:15:18 -0000

Author: imp
Date: Fri Aug 14 16:15:18 2009
New Revision: 196215
URL: http://svn.freebsd.org/changeset/base/196215

Log:
  (u_int) is the wrong type here.  Use unsigned long instead, even
  though that's only less wrong...
  
  # This gets the kernel building again to the point it was at before
  # the last IFC for the OCTEON1 kernel config.

Modified:
  projects/mips/sys/mips/include/param.h

Modified: projects/mips/sys/mips/include/param.h
==============================================================================
--- projects/mips/sys/mips/include/param.h	Fri Aug 14 13:26:50 2009	(r196214)
+++ projects/mips/sys/mips/include/param.h	Fri Aug 14 16:15:18 2009	(r196215)
@@ -83,7 +83,7 @@
  * any desired pointer type.
  */
 #define	_ALIGNBYTES	7
-#define	_ALIGN(p)	(((u_int)(p) + _ALIGNBYTES) &~ _ALIGNBYTES)
+#define	_ALIGN(p)	(((unsigned long)(p) + _ALIGNBYTES) &~ _ALIGNBYTES)
 
 #define	ALIGNBYTES	_ALIGNBYTES
 #define	ALIGN(p)	_ALIGN(p)
@@ -93,7 +93,7 @@
  * This does not reflect the optimal alignment, just the possibility
  * (within reasonable limits). 
  */
-#define	ALIGNED_POINTER(p, t)	((((unsigned)(p)) & (sizeof (t) - 1)) == 0)
+#define	ALIGNED_POINTER(p, t)	((((unsigned long)(p)) & (sizeof (t) - 1)) == 0)
 
 /*
  * CACHE_LINE_SIZE is the compile-time maximum cache line size for an