[tip:x86/urgent] x86: SGI UV: Fix IPI macros

From: tip-bot for Jack Steiner
Date: Fri Sep 18 2009 - 08:07:21 EST


Commit-ID: d2374aecda3f6c9b0d13287027132a37311da300
Gitweb: http://git.kernel.org/tip/d2374aecda3f6c9b0d13287027132a37311da300
Author: Jack Steiner <steiner@xxxxxxx>
AuthorDate: Wed, 9 Sep 2009 10:41:05 -0500
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Fri, 18 Sep 2009 14:04:25 +0200

x86: SGI UV: Fix IPI macros

The UV BIOS has changed the way interrupt remapping is being done.
This affects the id used for sending IPIs. The upper id bits no
longer need to be masked off.

Signed-off-by: Jack Steiner <steiner@xxxxxxx>
Cc: <stable@xxxxxxxxxx>
LKML-Reference: <20090909154104.GA25083@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>


---
arch/x86/include/asm/uv/uv_hub.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h
index 77a6850..03a0cbd 100644
--- a/arch/x86/include/asm/uv/uv_hub.h
+++ b/arch/x86/include/asm/uv/uv_hub.h
@@ -422,7 +422,7 @@ static inline void uv_hub_send_ipi(int pnode, int apicid, int vector)
unsigned long val;

val = (1UL << UVH_IPI_INT_SEND_SHFT) |
- ((apicid & 0x3f) << UVH_IPI_INT_APIC_ID_SHFT) |
+ ((apicid) << UVH_IPI_INT_APIC_ID_SHFT) |
(vector << UVH_IPI_INT_VECTOR_SHFT);
uv_write_global_mmr64(pnode, UVH_IPI_INT, val);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/