Branch b1_4

Fix compile breakage on Cray XT3

b=13516
i=johann
i=adilger

diff --git a/lnet/selftest/selftest.h b/lnet/selftest/selftest.h
index 9e9fb67..dd97726 100644 (file)
--- a/lnet/selftest/selftest.h
+++ b/lnet/selftest/selftest.h
@@ -10,11 +10,11 @@
 
 #define LNET_ONLY
 
-#include <libcfs/kp30.h>
-#include <libcfs/libcfs.h>
 #ifndef __KERNEL__
 #include <liblustre.h> /* userland spinlock_t and atomic_t */
 #endif
+#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
 #include <lnet/lib-lnet.h>
 #include <lnet/lib-types.h>