- temporarily disable building some dirs when cray portals are in use

- revert the overly aggressive migration of portals/list.h
- make sure all builds see -DCRAY_PORTALS.  this is gross.
- protect the libcfs ioctl registration with __KERNEL__
- avoid portals_nid2str() as it breaks the compiler

diff --git a/lnet/Makefile.am b/lnet/Makefile.am
index 9f6afac..0083ac1 100644 (file)
--- a/lnet/Makefile.am
+++ b/lnet/Makefile.am
@@ -11,7 +11,7 @@ SUBDIRS = portals unals utils
 else
 
 if CRAY_PORTALS
-SUBDIRS = libcfs unals utils tests doc 
+SUBDIRS = libcfs tests doc 
 else 
 SUBDIRS = libcfs portals knals unals utils tests doc router
 endif

diff --git a/lustre/portals/Makefile.am b/lustre/portals/Makefile.am
index 9f6afac..0083ac1 100644 (file)
--- a/lustre/portals/Makefile.am
+++ b/lustre/portals/Makefile.am
@@ -11,7 +11,7 @@ SUBDIRS = portals unals utils
 else
 
 if CRAY_PORTALS
-SUBDIRS = libcfs unals utils tests doc 
+SUBDIRS = libcfs tests doc 
 else 
 SUBDIRS = libcfs portals knals unals utils tests doc router
 endif