Branch b1_6

b=16059
i=johann, shadow

Fixed for ppc64 lack of PAGE_SHIFT defined.

diff --git a/lnet/include/libcfs/user-prim.h b/lnet/include/libcfs/user-prim.h
index 781e1e4..389483a 100644 (file)
--- a/lnet/include/libcfs/user-prim.h
+++ b/lnet/include/libcfs/user-prim.h
@@ -127,7 +127,9 @@ struct page {
 
 typedef struct page cfs_page_t;
 
-#ifndef PAGE_SIZE
+/* ppc64 defined PAGE_SIZE but without PAGE_SHIFT
+ */
+#if !defined(PAGE_SHIFT) || !defined(PAGE_SIZE)
 
 /* 4K */
 #define CFS_PAGE_SHIFT 12