b=2914

[fs/lustre-release.git] / lnet / include / lnet / types.h

diff --git a/lnet/include/lnet/types.h b/lnet/include/lnet/types.h
index 7ffe797..74ef493 100644 (file)
--- a/lnet/include/lnet/types.h
+++ b/lnet/include/lnet/types.h
@@ -3,7 +3,13 @@
 
 #ifdef __linux__
 # include <asm/types.h>
-# include <asm/timex.h>
+# if defined(__powerpc__) && !defined(__KERNEL__)
+#  define __KERNEL__
+#  include <asm/timex.h>
+#  undef __KERNEL__
+# else
+#  include <asm/timex.h>
+# endif
 #else
 # include <sys/types.h>
 typedef u_int32_t __u32;
@@ -14,7 +20,7 @@ typedef u_int64_t __u64;
 # include <linux/time.h>
 #else
 # include <sys/time.h>
-# define do_gettimeofday(tv) gettimeofday(tv, NULL)
+# define do_gettimeofday(tv) gettimeofday(tv, NULL);
 #endif
 
 #include <portals/errno.h>