LU-663 kernel: Some arch do not have NUMA features anymore

[fs/lustre-release.git] / lustre / include / linux / lustre_compat25.h

diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h
index 5912064..ecaa8eb 100644 (file)
--- a/lustre/include/linux/lustre_compat25.h
+++ b/lustre/include/linux/lustre_compat25.h
@@ -692,10 +692,6 @@ static inline int ll_crypto_hmac(struct crypto_tfm *tfm,
 #define cfs_for_each_possible_cpu(cpu) for_each_cpu(cpu)
 #endif
 
-#ifndef cpu_to_node
-#define cpu_to_node(cpu)         0
-#endif
-
 #ifdef HAVE_BIO_ENDIO_2ARG
 #define cfs_bio_io_error(a,b)   bio_io_error((a))
 #define cfs_bio_endio(a,b,c)    bio_endio((a),(c))
@@ -817,6 +813,10 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount)
 #define blk_queue_max_hw_sectors(q, sect) blk_queue_max_sectors(q, sect)
 #endif
 
+#ifndef HAVE_BLKDEV_GET_BY_DEV
+# define blkdev_get_by_dev(dev, mode, holder) open_by_devnum(dev, mode)
+#endif
+
 #ifndef HAVE_REQUEST_QUEUE_LIMITS
 #define queue_max_sectors(rq)             ((rq)->max_sectors)
 #define queue_max_hw_sectors(rq)          ((rq)->max_hw_sectors)
@@ -856,5 +856,10 @@ static inline int ll_quota_off(struct super_block *sb, int off, int remount)
 #define ll_pagevec_lru_add_file(pv)     pagevec_lru_add_file(pv)
 #endif
 
+#if !defined(HAVE_NODE_TO_CPUMASK) && defined(HAVE_CPUMASK_OF_NODE)
+#define node_to_cpumask(i)         (*(cpumask_of_node(i)))
+#define HAVE_NODE_TO_CPUMASK
+#endif
+
 #endif /* __KERNEL__ */
 #endif /* _COMPAT25_H */