summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRuss Anderson <rja@sgi.com>2007-12-21 02:46:52 +0300
committerTony Luck <tony.luck@intel.com>2008-01-04 00:18:58 +0300
commit4ca8ad7e4c38cd7f32b11e60418d06fa912a1a37 (patch)
tree1c7cc726f6f772da7ad5006afd2cf6523d153b61 /include
parent304b46996ca1a989fe0fe99831ed38c79e855245 (diff)
downloadlinux-4ca8ad7e4c38cd7f32b11e60418d06fa912a1a37.tar.xz
[IA64] Update Altix BTE error return status patch
I neglected to send Tony the most recent version of the patch ("Fix Altix BTE error return status") applied as commit: 64135fa97ce016058f95345425a9ebd04ee1bd2a This patch gets it up to date. Without this patch on shub2, if there is no error xpcBteUnmappedError is returned instead of xpcSuccess. Signed-off-by: Russ Anderson (rja@sgi.com) Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include')
-rw-r--r--include/asm-ia64/sn/xpc.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-ia64/sn/xpc.h b/include/asm-ia64/sn/xpc.h
index 8e5d7de9c632..3c0900ab8003 100644
--- a/include/asm-ia64/sn/xpc.h
+++ b/include/asm-ia64/sn/xpc.h
@@ -1211,11 +1211,13 @@ xpc_IPI_init(int index)
static inline enum xpc_retval
xpc_map_bte_errors(bte_result_t error)
{
+ if (error == BTE_SUCCESS)
+ return xpcSuccess;
+
if (is_shub2()) {
if (BTE_VALID_SH2_ERROR(error))
return xpcBteSh2Start + error;
- else
- return xpcBteUnmappedError;
+ return xpcBteUnmappedError;
}
switch (error) {
case BTE_SUCCESS: return xpcSuccess;