From owner-svn-src-projects@FreeBSD.ORG  Fri Nov 20 15:50:56 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 B221D106566C;
	Fri, 20 Nov 2009 15:50:56 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A0AF48FC15;
	Fri, 20 Nov 2009 15:50:56 +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 nAKFouiT048534;
	Fri, 20 Nov 2009 15:50:56 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAKFou3q048531;
	Fri, 20 Nov 2009 15:50:56 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200911201550.nAKFou3q048531@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Fri, 20 Nov 2009 15:50:56 +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: r199587 - in projects/ppc64/sys: kern powerpc/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, 20 Nov 2009 15:50:56 -0000

Author: nwhitehorn
Date: Fri Nov 20 15:50:56 2009
New Revision: 199587
URL: http://svn.freebsd.org/changeset/base/199587

Log:
  Fix some build errors involving accidnetal inclusion of sys/_types.h
  from assembly and swizzle_fdset being defined on 32-bit systems. Both
  32-bit and 64-bit kernels now build and run.

Modified:
  projects/ppc64/sys/kern/sys_generic.c
  projects/ppc64/sys/powerpc/include/_align.h

Modified: projects/ppc64/sys/kern/sys_generic.c
==============================================================================
--- projects/ppc64/sys/kern/sys_generic.c	Fri Nov 20 15:48:58 2009	(r199586)
+++ projects/ppc64/sys/kern/sys_generic.c	Fri Nov 20 15:50:56 2009	(r199587)
@@ -897,7 +897,7 @@ kern_select(struct thread *td, int nd, f
 	getbits(fd_ex, 2);
 #undef	getbits
 
-#if BYTE_ORDER == BIG_ENDIAN
+#if BYTE_ORDER == BIG_ENDIAN && defined(__LP64__)
 	/*
 	 * XXX: swizzle_fdset assumes that if abi_nfdbits != NFDBITS,
 	 * we are running under 32-bit emulation. This should be more

Modified: projects/ppc64/sys/powerpc/include/_align.h
==============================================================================
--- projects/ppc64/sys/powerpc/include/_align.h	Fri Nov 20 15:48:58 2009	(r199586)
+++ projects/ppc64/sys/powerpc/include/_align.h	Fri Nov 20 15:50:56 2009	(r199587)
@@ -41,8 +41,6 @@
 #ifndef _POWERPC_INCLUDE__ALIGN_H_
 #define	_POWERPC_INCLUDE__ALIGN_H_
 
-#include <sys/_types.h>
-
 /*
  * Round p (pointer or byte index) up to a correctly-aligned value
  * for all data types (int, long, ...).   The result is unsigned int