svn commit: r206357 - stable/8/sys/fs/nfs

[Rick Macklem]

Author: rmacklem
Date: Wed Apr  7 15:19:52 2010
New Revision: 206357
URL: http://svn.freebsd.org/changeset/base/206357

Log:
  MFC: r205572
  Fix the experimental NFS subsystem so that it uses the correct
  preprocessor macro name for not requiring strict data alignment.

Modified:
  stable/8/sys/fs/nfs/nfs_commonport.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/fs/nfs/nfs_commonport.c
==============================================================================
--- stable/8/sys/fs/nfs/nfs_commonport.c	Wed Apr  7 15:09:35 2010	(r206356)
+++ stable/8/sys/fs/nfs/nfs_commonport.c	Wed Apr  7 15:19:52 2010	(r206357)
@@ -117,7 +117,7 @@ struct mtx nfs_slock_mutex;
 /* local functions */
 static int nfssvc_call(struct thread *, struct nfssvc_args *, struct ucred *);
 
-#if defined(__i386__)
+#ifdef __NO_STRICT_ALIGNMENT
 /*
  * These architectures don't need re-alignment, so just return.
  */
@@ -127,7 +127,7 @@ newnfs_realign(struct mbuf **pm)
 
 	return;
 }
-#else
+#else	/* !__NO_STRICT_ALIGNMENT */
 /*
  *	newnfs_realign:
  *
@@ -185,7 +185,7 @@ newnfs_realign(struct mbuf **pm)
 		pm = &m->m_next;
 	}
 }
-#endif	/* !__i386__ */
+#endif	/* __NO_STRICT_ALIGNMENT */
 
 #ifdef notdef
 static void