svn commit: r199587 - in projects/ppc64/sys: kern powerpc/include

[Nathan Whitehorn]

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