Branch b1_6

b=15033
i=adilger
i=johann

fix compile issue on Cray systems and an autoconf problem.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 8b3c3dd..5a43cf0 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -440,6 +440,11 @@ Description: Detect stride IO mode in read-ahead
 Details    : When a client does stride read, read-ahead should detect that and
             read-ahead pages according to the detected stride pattern. 
 
+Severity   : normal
+Bugzilla   : 15033
+Description: build for x2 fails
+Details    : fix compile issue on Cray systems.
+
 --------------------------------------------------------------------------------
 
 2007-12-07         Cluster File Systems, Inc. <info@clusterfs.com>

diff --git a/lustre/include/linux/lustre_types.h b/lustre/include/linux/lustre_types.h
index 0525925..3aec53f 100644 (file)
--- a/lustre/include/linux/lustre_types.h
+++ b/lustre/include/linux/lustre_types.h
@@ -22,7 +22,8 @@
         !defined(_EXT2_TYPES_H) && !defined(_I386_TYPES_H) && \
         !defined(_ASM_IA64_TYPES_H) && !defined(_X86_64_TYPES_H) && \
         !defined(_PPC_TYPES_H) && !defined(_PPC64_TYPES_H) && \
-        !defined(_ASM_POWERPC_TYPES_H) && !defined(__mips64__)
+        !defined(_ASM_POWERPC_TYPES_H) && !defined(__mips64__) && \
+       !defined(_CRAYNV_TYPES_H)
         /* yuck, would be nicer with _ASM_TYPES_H */
 
 typedef unsigned short umode_t;