From c04d325bd0f5665d9479e4684c9f587cfcfcb541 Mon Sep 17 00:00:00 2001
From: johann <johann>
Date: Mon, 17 Mar 2008 16:10:46 +0000
Subject: [PATCH] Branch HEAD
b=15033
i=adilger
i=johann
fix compile issue on Cray systems.
---
lustre/ChangeLog | 5 +++++
lustre/include/linux/lustre_types.h | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index b93151eae5..08463bc8bb 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -829,6 +829,11 @@ Description: use adler32 for page checksums
Details : when available, use the Adler-32 algorithm instead of CRC32 for
page checksums.
+Severity : normal
+Bugzilla : 15033
+Description: build for x2 fails
+Details : fix compile issue on Cray systems.
+
--------------------------------------------------------------------------------
2007-08-10 Cluster File Systems, Inc. <info@clusterfs.com>
diff --git a/lustre/include/linux/lustre_types.h b/lustre/include/linux/lustre_types.h
index 0525925e6d..3aec53f66e 100644
--- 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;
--
GitLab