This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 9d5ce23c06633df3587357e258bf15332ca69eae (commit) from 7d91972ad4c39e50d7971592625a6ae23a598ae8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/9d5ce23c06633df3587357e258bf15332c... commit 9d5ce23c06633df3587357e258bf15332ca69eae Author: Norio Yamaguchi <[email protected]> Date: Wed May 28 09:31:52 2014 +0900 Fix build warnings about comparison of pointer Signed-off-by: Pavan Balaji <[email protected]> diff --git a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_ibcom.c b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_ibcom.c index 7732be8..8ff798b 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_ibcom.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_ibcom.c @@ -110,7 +110,7 @@ static int MPID_nem_ib_rdmawr_to_init(uint64_t sz) MPID_nem_ib_rdmawr_to_alloc_start = start; MPID_nem_ib_rdmawr_to_alloc_free_list = start; for (cur = start; - cur < (uint8_t *) start + sz - MPID_NEM_IB_COM_RDMABUF_SZSEG; + cur < (void *) ((uint8_t *) start + sz - MPID_NEM_IB_COM_RDMABUF_SZSEG); cur = (uint8_t *) cur + MPID_NEM_IB_COM_RDMABUF_SZSEG) { //dprintf("rdmawr_to_init,cur=%p\n", cur); ((MPID_nem_ib_rdmawr_to_alloc_hdr_t *) cur)->next = diff --git a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c index 06db998..4426052 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c @@ -580,7 +580,7 @@ int MPID_nem_ib_poll_eager(MPID_nem_ib_ringbuf_t * ringbuf) #if 1 void *rsi; - for (rsi = (void *) buf; rsi < (uint8_t *) buf + MPID_NEM_IB_NETMOD_HDR_SZ_GET(buf); + for (rsi = (void *) buf; rsi < (void *) ((uint8_t *) buf + MPID_NEM_IB_NETMOD_HDR_SZ_GET(buf)); rsi = (uint8_t *) rsi + 64 * 4) { #ifdef __MIC__ __asm__ __volatile__ @@ -1167,9 +1167,9 @@ int MPID_nem_ib_recv_buf_released(struct MPIDI_VC *vc, void *user_data) goto fn_exit; } - if (MPID_nem_ib_rdmawr_to_alloc_start > user_data && - user_data >= MPID_nem_ib_rdmawr_to_alloc_start + - MPID_NEM_IB_COM_RDMABUF_SZ * MPID_NEM_IB_NRINGBUF) { + if ((void *) MPID_nem_ib_rdmawr_to_alloc_start > user_data && + user_data >= (void *) (MPID_nem_ib_rdmawr_to_alloc_start + + MPID_NEM_IB_COM_RDMABUF_SZ * MPID_NEM_IB_NRINGBUF)) { MPID_nem_ib_segv; } unsigned long mod = @@ -1208,7 +1208,7 @@ int MPID_nem_ib_recv_buf_released(struct MPIDI_VC *vc, void *user_data) (unsigned long) ((uint8_t *) user_data - (uint8_t *) vc_ib->ibcom->remote_ringbuf->start) / MPID_NEM_IB_COM_RDMABUF_SZSEG; - MPIU_Assert(0 <= index_slot && index_slot < vc_ib->ibcom->remote_ringbuf->nslot); + MPIU_Assert(0 <= index_slot && index_slot < (uint16_t) (vc_ib->ibcom->remote_ringbuf->nslot)); dprintf("released,user_data=%p,mem=%p,sub=%08lx,index_slot=%d\n", user_data, vc_ib->ibcom->remote_ringbuf->start, (unsigned long) user_data - ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/channels/nemesis/netmod/ib/ib_ibcom.c | 2 +- src/mpid/ch3/channels/nemesis/netmod/ib/ib_poll.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- MPICH primary repository