From: tip-bot for Jack Steiner <steiner@sgi.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
steiner@sgi.com, stable@kernel.org, tglx@linutronix.de
Subject: [tip:x86/uv] x86, uv: uv_global_gru_mmr_address() macro fix
Date: Thu, 7 Jan 2010 23:57:40 GMT [thread overview]
Message-ID: <tip-e1e0138d7d10fd447c71cc70f367eac514bd3ce4@git.kernel.org> (raw)
In-Reply-To: <20100107161240.GA2610@sgi.com>
Commit-ID: e1e0138d7d10fd447c71cc70f367eac514bd3ce4
Gitweb: http://git.kernel.org/tip/e1e0138d7d10fd447c71cc70f367eac514bd3ce4
Author: Jack Steiner <steiner@sgi.com>
AuthorDate: Thu, 7 Jan 2010 10:12:40 -0600
Committer: H. Peter Anvin <hpa@zytor.com>
CommitDate: Thu, 7 Jan 2010 11:49:57 -0800
x86, uv: uv_global_gru_mmr_address() macro fix
Fix bug in uv_global_gru_mmr_address macro. Macro failed
to cast an int value to a long prior to a left shift > 32.
Signed-off-by: Jack Steiner <steiner@sgi.com>
LKML-Reference: <20100107161240.GA2610@sgi.com>
Cc: <stable@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
arch/x86/include/asm/uv/uv_hub.h | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h
index 811bfab..7a81d9d 100644
--- a/arch/x86/include/asm/uv/uv_hub.h
+++ b/arch/x86/include/asm/uv/uv_hub.h
@@ -335,7 +335,8 @@ static inline unsigned long uv_read_global_mmr64(int pnode,
*/
static inline unsigned long uv_global_gru_mmr_address(int pnode, unsigned long offset)
{
- return UV_GLOBAL_GRU_MMR_BASE | offset | (pnode << uv_hub_info->m_val);
+ return UV_GLOBAL_GRU_MMR_BASE | offset |
+ ((unsigned long)pnode << uv_hub_info->m_val);
}
/*
prev parent reply other threads:[~2010-01-09 22:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-07 16:12 [PATCH] x86, UV - uv_global_gru_mmr_address() macro fix Jack Steiner
2010-01-07 23:57 ` tip-bot for Jack Steiner [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-e1e0138d7d10fd447c71cc70f367eac514bd3ce4@git.kernel.org \
--to=steiner@sgi.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=stable@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox