diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-09-08 23:03:30 +0100 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-09-08 23:03:30 +0100 |
commit | 223176bc722a7bf519904180e956292ae1d1e819 (patch) | |
tree | 75b84d09c4b6eed81e537a4e587236f05faa5b7d /fs/xfs/xfs_arch.h | |
parent | 7d333d6c739a5cd6d60102ea1a9940cbbb0546ec (diff) | |
parent | 1b11d78cf87a7014f96e5b7fa2e1233cc8081a00 (diff) | |
download | linux-223176bc722a7bf519904180e956292ae1d1e819.tar.gz linux-223176bc722a7bf519904180e956292ae1d1e819.tar.bz2 linux-223176bc722a7bf519904180e956292ae1d1e819.zip |
Merge branch 'master' of /usr/src/linux-2.6
Diffstat (limited to 'fs/xfs/xfs_arch.h')
-rw-r--r-- | fs/xfs/xfs_arch.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/fs/xfs/xfs_arch.h b/fs/xfs/xfs_arch.h index ae35189b3d70..5ab0dd885b1b 100644 --- a/fs/xfs/xfs_arch.h +++ b/fs/xfs/xfs_arch.h @@ -40,22 +40,28 @@ #include <asm/byteorder.h> -#ifdef __LITTLE_ENDIAN -# define __BYTE_ORDER __LITTLE_ENDIAN -#endif #ifdef __BIG_ENDIAN -# define __BYTE_ORDER __BIG_ENDIAN +#define XFS_NATIVE_HOST 1 +#else +#undef XFS_NATIVE_HOST +#endif + +#else /* __KERNEL__ */ + +#if __BYTE_ORDER == __BIG_ENDIAN +#define XFS_NATIVE_HOST 1 +#else +#undef XFS_NATIVE_HOST #endif #endif /* __KERNEL__ */ /* do we need conversion? */ - #define ARCH_NOCONVERT 1 -#if __BYTE_ORDER == __LITTLE_ENDIAN -# define ARCH_CONVERT 0 -#else +#ifdef XFS_NATIVE_HOST # define ARCH_CONVERT ARCH_NOCONVERT +#else +# define ARCH_CONVERT 0 #endif /* generic swapping macros */ |