Branch HEAD

b=14844
i=adilger
i=deen

fix compile issue on PPC.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 14fa8b3..0c16ad4 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -732,6 +732,12 @@ Details    : fix duplicated definitions between asm-ppc64/types.h and
             lustre_types.h on PPC.
 
 Severity   : normal
+Frequency  : PPC/PPC64 only
+Bugzilla   : 14844
+Description: asm-ppc/segment.h does not exist
+Details    : fix compile issue on PPC.
+
+Severity   : normal
 Bugzilla   : 14864
 Description: better handle error messages in extents code
 

diff --git a/lustre/include/linux/obd_class.h b/lustre/include/linux/obd_class.h
index c7869cc..086ee58 100644 (file)
--- a/lustre/include/linux/obd_class.h
+++ b/lustre/include/linux/obd_class.h
@@ -31,7 +31,9 @@
 #include <sys/types.h>
 #include <libcfs/list.h>
 #else
-#include <asm/segment.h>
+#ifdef HAVE_SEGMENT_H
+# include <asm/segment.h>
+#endif
 #include <asm/uaccess.h>
 #include <linux/types.h>
 #include <linux/fs.h>

diff --git a/lustre/llite/llite_mmap.c b/lustre/llite/llite_mmap.c
index 7d2651b..b1c5620 100644 (file)
--- a/lustre/llite/llite_mmap.c
+++ b/lustre/llite/llite_mmap.c
@@ -36,7 +36,9 @@
 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <asm/uaccess.h>
-#include <asm/segment.h>
+#ifdef HAVE_SEGMENT_H
+# include <asm/segment.h>
+#endif
 #include <linux/mm.h>
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>

diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c
index b33e23e..35cd6d7 100644 (file)
--- a/lustre/llite/rw.c
+++ b/lustre/llite/rw.c
@@ -37,7 +37,9 @@
 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <asm/uaccess.h>
-#include <asm/segment.h>
+#ifdef HAVE_SEGMENT_H
+# include <asm/segment.h>
+#endif
 #include <linux/mm.h>
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>

diff --git a/lustre/llite/rw26.c b/lustre/llite/rw26.c
index d2e625c..99d5337 100644 (file)
--- a/lustre/llite/rw26.c
+++ b/lustre/llite/rw26.c
@@ -41,7 +41,9 @@
 #include <linux/writeback.h>
 #include <linux/stat.h>
 #include <asm/uaccess.h>
-#include <asm/segment.h>
+#ifdef HAVE_SEGMENT_H
+# include <asm/segment.h>
+#endif
 #include <linux/mm.h>
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>

diff --git a/lustre/lvfs/upcall_cache.c b/lustre/lvfs/upcall_cache.c
index c6ede72..c2df572 100644 (file)
--- a/lustre/lvfs/upcall_cache.c
+++ b/lustre/lvfs/upcall_cache.c
@@ -43,7 +43,9 @@
 #include <linux/stat.h>
 #include <asm/uaccess.h>
 #include <linux/slab.h>
-#include <asm/segment.h>
+#ifdef HAVE_SEGMENT_H
+# include <asm/segment.h>
+#endif
 
 #include <obd_support.h>
 #include <lustre_lib.h>

diff --git a/lustre/mds/mds_lib.c b/lustre/mds/mds_lib.c
index bd3f2c5..3244cf6 100644 (file)
--- a/lustre/mds/mds_lib.c
+++ b/lustre/mds/mds_lib.c
@@ -44,7 +44,9 @@
 #include <linux/stat.h>
 #include <asm/uaccess.h>
 #include <linux/slab.h>
-#include <asm/segment.h>
+#ifdef HAVE_SEGMENT_H
+# include <asm/segment.h>
+#endif
 
 #include <obd_support.h>
 #include <lustre_lib.h>

diff --git a/lustre/mdt/mdt_identity.c b/lustre/mdt/mdt_identity.c
index 12ed4a8..1353df6 100644 (file)
--- a/lustre/mdt/mdt_identity.c
+++ b/lustre/mdt/mdt_identity.c
@@ -44,7 +44,9 @@
 #include <linux/stat.h>
 #include <asm/uaccess.h>
 #include <linux/slab.h>
+#ifdef HAVE_SEGMENT_H
 #include <asm/segment.h>
+#endif
 
 #include <libcfs/kp30.h>
 #include <obd.h>

diff --git a/lustre/mdt/mdt_idmap.c b/lustre/mdt/mdt_idmap.c
index c7a4c31..a84ec9c 100644 (file)
--- a/lustre/mdt/mdt_idmap.c
+++ b/lustre/mdt/mdt_idmap.c
@@ -43,7 +43,9 @@
 #include <linux/stat.h>
 #include <asm/uaccess.h>
 #include <linux/slab.h>
+#ifdef HAVE_SEGMENT_H
 #include <asm/segment.h>
+#endif
 
 #include <libcfs/kp30.h>
 #include <obd.h>

diff --git a/lustre/obdclass/linux/linux-sysctl.c b/lustre/obdclass/linux/linux-sysctl.c
index c7d7ef0..ef94633 100644 (file)
--- a/lustre/obdclass/linux/linux-sysctl.c
+++ b/lustre/obdclass/linux/linux-sysctl.c
@@ -35,7 +35,9 @@
 #include <linux/stat.h>
 #include <linux/ctype.h>
 #include <asm/bitops.h>
-#include <asm/segment.h>
+#ifdef HAVE_SEGMENT_H
+# include <asm/segment.h>
+#endif
 #include <asm/uaccess.h>
 #include <linux/utsname.h>