From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + xpc_sn2-fix-max-warning-about-pointers-of-different-types.patch added to -mm tree Date: Wed, 01 Apr 2009 12:31:11 -0700 Message-ID: <200904011931.n31JVBhB023953@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:34247 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757432AbZDATdj (ORCPT ); Wed, 1 Apr 2009 15:33:39 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: holt@sgi.com, sam@ravnborg.org The patch titled xpc_sn2: fix max() warning about pointers of different types has been added to the -mm tree. Its filename is xpc_sn2-fix-max-warning-about-pointers-of-different-types.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: xpc_sn2: fix max() warning about pointers of different types From: Robin Holt Fix a minor compile warning when building on ia64. drivers/misc/sgi-xp/xpc_sn2.c: In function `xpc_clear_remote_msgqueue_flags_sn2': drivers/misc/sgi-xp/xpc_sn2.c:1746: warning: comparison of distinct pointer types lacks a cast Signed-off-by: Robin Holt Cc: Sam Ravnborg Signed-off-by: Andrew Morton --- drivers/misc/sgi-xp/xpc_sn2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff -puN drivers/misc/sgi-xp/xpc_sn2.c~xpc_sn2-fix-max-warning-about-pointers-of-different-types drivers/misc/sgi-xp/xpc_sn2.c --- a/drivers/misc/sgi-xp/xpc_sn2.c~xpc_sn2-fix-max-warning-about-pointers-of-different-types +++ a/drivers/misc/sgi-xp/xpc_sn2.c @@ -1744,20 +1744,20 @@ xpc_clear_remote_msgqueue_flags_sn2(stru { struct xpc_channel_sn2 *ch_sn2 = &ch->sn.sn2; struct xpc_msg_sn2 *msg; - s64 put; + s64 put, remote_nentries = ch->remote_nentries; /* flags are zeroed when the buffer is allocated */ - if (ch_sn2->remote_GP.put < ch->remote_nentries) + if (ch_sn2->remote_GP.put < remote_nentries) return; - put = max(ch_sn2->w_remote_GP.put, ch->remote_nentries); + put = max(ch_sn2->w_remote_GP.put, remote_nentries); do { msg = (struct xpc_msg_sn2 *)((u64)ch_sn2->remote_msgqueue + - (put % ch->remote_nentries) * + (put % remote_nentries) * ch->entry_size); DBUG_ON(!(msg->flags & XPC_M_SN2_READY)); DBUG_ON(!(msg->flags & XPC_M_SN2_DONE)); - DBUG_ON(msg->number != put - ch->remote_nentries); + DBUG_ON(msg->number != put - remote_nentries); msg->flags = 0; } while (++put < ch_sn2->remote_GP.put); } _ Patches currently in -mm which might be from holt@sgi.com are xpc_sn2-fix-max-warning-about-pointers-of-different-types.patch factor-out-ifdefs-from-kernel-spinlockc-to-lock_contended_flags.patch allow-rwlocks-to-re-enable-interrupts.patch ia64-implement-interrupt-enabling-rwlocks.patch