b=20339

i=he.huang
i=sheng.yang

	fix ia64 and ppc build failure.

diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
index a1c72d3..601ccb7 100644 (file)
--- a/libcfs/autoconf/lustre-libcfs.m4
+++ b/libcfs/autoconf/lustre-libcfs.m4
@@ -531,17 +531,17 @@ AC_CHECK_FUNCS([strnlen])
 AC_CHECK_TYPE([umode_t],
        [AC_DEFINE(HAVE_UMODE_T, 1, [umode_t is defined])],
        [],
 AC_CHECK_TYPE([umode_t],
        [AC_DEFINE(HAVE_UMODE_T, 1, [umode_t is defined])],
        [],

-       [#include <signal.h>])
+       [#include <asm/types.h>])

 
 AC_CHECK_TYPE([__u64],
        [AC_DEFINE(HAVE___U64, 1, [__u64 is defined])],
        [],
 
 AC_CHECK_TYPE([__u64],
        [AC_DEFINE(HAVE___U64, 1, [__u64 is defined])],
        [],

-       [#include <signal.h>])
+       [#include <asm/types.h>])

 
 AC_CHECK_TYPE([__s64],
        [AC_DEFINE(HAVE___S64, 1, [__s64 is defined])],
        [],
 
 AC_CHECK_TYPE([__s64],
        [AC_DEFINE(HAVE___S64, 1, [__s64 is defined])],
        [],

-       [#include <signal.h>])
+       [#include <asm/types.h>])

 
 # --------  Check for required packages  --------------
 
 
 # --------  Check for required packages  --------------
 

diff --git a/libcfs/include/libcfs/linux/libcfs.h b/libcfs/include/libcfs/linux/libcfs.h
index 39da4ca..eb0adcf 100644 (file)
--- a/libcfs/include/libcfs/linux/libcfs.h
+++ b/libcfs/include/libcfs/linux/libcfs.h
@@ -45,9 +45,6 @@
 #error This include is only for kernel use.
 #endif
 
 #error This include is only for kernel use.
 #endif
 

-#ifdef HAVE_ASM_TYPES_H
-#include <asm/types.h>
-#endif

 
 #include <stdarg.h>
 #include <libcfs/linux/linux-time.h>
 
 #include <stdarg.h>
 #include <libcfs/linux/linux-time.h>


@@ -58,6 +55,7 @@
 #include <libcfs/linux/linux-tcpip.h>
 #include <libcfs/linux/kp30.h>
 
 #include <libcfs/linux/linux-tcpip.h>
 #include <libcfs/linux/kp30.h>
 

+#include <asm/types.h>

 #include <linux/types.h>
 #include <asm/timex.h>
 #include <linux/sched.h> /* THREAD_SIZE */
 #include <linux/types.h>
 #include <asm/timex.h>
 #include <linux/sched.h> /* THREAD_SIZE */

diff --git a/libcfs/include/libcfs/posix/posix-types.h b/libcfs/include/libcfs/posix/posix-types.h
index 911ba95..1736a02 100644 (file)
--- a/libcfs/include/libcfs/posix/posix-types.h
+++ b/libcfs/include/libcfs/posix/posix-types.h
@@ -42,6 +42,7 @@
 #ifndef _LUSTRE_POSIX_TYPES_H
 #define _LUSTRE_POSIX_TYPES_H
 
 #ifndef _LUSTRE_POSIX_TYPES_H
 #define _LUSTRE_POSIX_TYPES_H
 

+#include <asm/types.h>

 #ifndef HAVE_UMODE_T
 typedef unsigned short umode_t;
 #endif
 #ifndef HAVE_UMODE_T
 typedef unsigned short umode_t;
 #endif