From owner-svn-src-all@FreeBSD.ORG  Sat Mar  3 21:39:12 2012
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 E9C191065672;
	Sat,  3 Mar 2012 21:39:12 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D4DE98FC1D;
	Sat,  3 Mar 2012 21:39:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q23LdCax001085;
	Sat, 3 Mar 2012 21:39:12 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q23LdCoI001083;
	Sat, 3 Mar 2012 21:39:12 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201203032139.q23LdCoI001083@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Sat, 3 Mar 2012 21:39:12 +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: r232475 - head/sys/compat/freebsd32
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: Sat, 03 Mar 2012 21:39:13 -0000

Author: jmallett
Date: Sat Mar  3 21:39:12 2012
New Revision: 232475
URL: http://svn.freebsd.org/changeset/base/232475

Log:
  On MIPS, _ALIGN always aligns to 8 bytes, even for 32-bit binaries.  This might
  not be ideal, but is the ABI we've shipped so far.  Fix macros which reflect
  the results of _ALIGN on 32-bit MIPS to use the right alignment.
  
  This fixes sendmsg under COMPAT_FREEBSD32 on n64 MIPS kernels.

Modified:
  head/sys/compat/freebsd32/freebsd32_misc.c

Modified: head/sys/compat/freebsd32/freebsd32_misc.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_misc.c	Sat Mar  3 19:03:26 2012	(r232474)
+++ head/sys/compat/freebsd32/freebsd32_misc.c	Sat Mar  3 21:39:12 2012	(r232475)
@@ -952,7 +952,11 @@ freebsd32_copyoutmsghdr(struct msghdr *m
 	return (error);
 }
 
+#ifndef __mips__
 #define FREEBSD32_ALIGNBYTES	(sizeof(int) - 1)
+#else
+#define FREEBSD32_ALIGNBYTES	(sizeof(long) - 1)
+#endif
 #define FREEBSD32_ALIGN(p)	\
 	(((u_long)(p) + FREEBSD32_ALIGNBYTES) & ~FREEBSD32_ALIGNBYTES)
 #define	FREEBSD32_CMSG_SPACE(l)	\