From c43e26a94c069e25c8f01b435310ded31b029bee Mon Sep 17 00:00:00 2001
From: bobijam <bobijam>
Date: Tue, 29 Jan 2008 10:36:01 +0000
Subject: [PATCH] Branch b1_6 b=14139 o=Bob Glossman(bogl@cray.com) i=adilger
fix building errors for xt3 in SLES10.
---
lnet/include/libcfs/user-bitops.h | 6 +++---
lnet/include/lnet/api.h | 2 +-
lnet/lnet/lib-move.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lnet/include/libcfs/user-bitops.h b/lnet/include/libcfs/user-bitops.h
index 43fc2f1bf8..d2eea0edaf 100644
--- a/lnet/include/libcfs/user-bitops.h
+++ b/lnet/include/libcfs/user-bitops.h
@@ -27,7 +27,7 @@
#define __LIBCFS_USER_BITOPS_H__
/* test if bit nr is set in bitmap addr; returns previous value of bit nr */
-static __inline__ int set_bit(int nr, long * addr)
+static __inline__ int set_bit(int nr, unsigned long * addr)
{
long mask;
@@ -39,7 +39,7 @@ static __inline__ int set_bit(int nr, long * addr)
}
/* clear bit nr in bitmap addr; returns previous value of bit nr*/
-static __inline__ int clear_bit(int nr, long * addr)
+static __inline__ int clear_bit(int nr, unsigned long * addr)
{
long mask;
@@ -50,7 +50,7 @@ static __inline__ int clear_bit(int nr, long * addr)
return nr;
}
-static __inline__ int test_bit(int nr, const long * addr)
+static __inline__ int test_bit(int nr, const unsigned long * addr)
{
return ((1UL << (nr & (BITS_PER_LONG - 1))) & ((addr)[nr / BITS_PER_LONG])) != 0;
}
diff --git a/lnet/include/lnet/api.h b/lnet/include/lnet/api.h
index 20e917721f..adbe2e28bf 100644
--- a/lnet/include/lnet/api.h
+++ b/lnet/include/lnet/api.h
@@ -10,7 +10,7 @@ int LNetNIInit(lnet_pid_t requested_pid);
int LNetNIFini(void);
int LNetGetId(unsigned int index, lnet_process_id_t *id);
-int LNetDist(lnet_nid_t nid, lnet_nid_t *srcnid, int *order);
+int LNetDist(lnet_nid_t nid, lnet_nid_t *srcnid, __u32 *order);
int LNetCtl(unsigned int cmd, void *arg);
void LNetSnprintHandle (char *str, int str_len, lnet_handle_any_t handle);
diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c
index 817c898e02..c174762a25 100644
--- a/lnet/lnet/lib-move.c
+++ b/lnet/lnet/lib-move.c
@@ -2424,7 +2424,7 @@ LNetGet(lnet_nid_t self, lnet_handle_md_t mdh,
}
int
-LNetDist (lnet_nid_t dstnid, lnet_nid_t *srcnidp, int *orderp)
+LNetDist (lnet_nid_t dstnid, lnet_nid_t *srcnidp, __u32 *orderp)
{
struct list_head *e;
lnet_ni_t *ni;
@@ -2432,7 +2432,7 @@ LNetDist (lnet_nid_t dstnid, lnet_nid_t *srcnidp, int *orderp)
lnet_remotenet_t *rnet;
__u32 dstnet = LNET_NIDNET(dstnid);
int hops;
- int order = 2;
+ __u32 order = 2;
/* if !local_nid_dist_zero, I don't return a distance of 0 ever
* (when lustre sees a distance of 0, it substitutes 0@lo), so I
--
GitLab